Merge remote-tracking branch 'origin/dev_resi_event' into develop

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java

@@ -16,7 +16,7 @@ public class MentionUserFormDTO implements Serializable {
     /**
      * 人大代表用户id
      */
-    private String npcUserId;
+    private String userId;
 
     /**
      * 人大代表注册网格id

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -199,7 +199,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setCustomerId(customerId);
             mentionEntity.setResiEventId(resiEventId);
             mentionEntity.setUserType(EventConstant.NPC_USER);
-            mentionEntity.setUserId(npc.getNpcUserId());
+            mentionEntity.setUserId(npc.getUserId());
             mentionEntity.setGridId(npc.getGridId());
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql

@@ -3,7 +3,7 @@ CREATE TABLE `resi_event` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
   `GRID_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格id',
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织',
-  `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
+  `PIDS` varchar(255) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
   `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人',
   `IS_PARTY` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0',
   `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容',