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

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

@@ -15,7 +15,7 @@ public class ReportOrgFormDTO implements Serializable {
     /**
      * 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。
      */
-    private String orgType;
+    private String orgLevel;
 
     /**
      * 报给的组织或者网格id

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

@@ -216,6 +216,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             ResiEventReportOrgEntity entity=ConvertUtils.sourceToTarget(org,ResiEventReportOrgEntity.class);
             entity.setCustomerId(customerId);
             entity.setResiEventId(resiEventId);
+            entity.setOrgType(org.getOrgLevel());
             //默认是未读
             entity.setOrgRead(EventConstant.UN_READ);
             entity.setRedDot(true);