Merge remote-tracking branch 'origin/dev_1118' into dev_1118

# Conflicts:
#	esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java
#	esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDTO.java

@@ -87,6 +87,22 @@ public class GroupDTO implements Serializable {
 //     * 社区ID
 //     */
 //	private Long communityId;
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 
     /**
      * 网格

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDTO.java

@@ -108,6 +108,22 @@ public class TopicDTO implements Serializable {
 //     * 社区ID
 //     */
 //	private Long communityId;
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 
     /**
      * 网格

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java

@@ -58,6 +58,35 @@ public class GroupEntity extends BaseEpdcEntity {
      */
 	private String groupCategory;
 
+//    /**
+//     * 区
+//     */
+//	private String area;
+//
+//    /**
+//     * 区ID
+//     */
+//	private Long areaId;
+//
+//    /**
+//     * 街道
+//     */
+//	private String street;
+//
+//    /**
+//     * 街道ID
+//     */
+//	private Long streetId;
+//
+//    /**
+//     * 社区
+//     */
+//	private String community;
+//
+//    /**
+//     * 社区ID
+//     */
+//	private Long communityId;
 	/**
 	 * 父所有部门ID
 	 */

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java

@@ -79,6 +79,35 @@ public class TopicEntity extends BaseEpdcEntity {
      */
 	private String itemId;
 
+//    /**
+//     * 区
+//     */
+//	private String area;
+//
+//    /**
+//     * 区ID
+//     */
+//	private Long areaId;
+//
+//    /**
+//     * 街道
+//     */
+//	private String street;
+//
+//    /**
+//     * 街道ID
+//     */
+//	private Long streetId;
+//
+//    /**
+//     * 社区
+//     */
+//	private String community;
+//
+//    /**
+//     * 社区ID
+//     */
+//	private Long communityId;
 	/**
 	 * 父所有部门ID
 	 */