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

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java

@@ -28,6 +28,10 @@ public class IcPolicyDTO implements Serializable {
      */
 	private String orgId;
 
+    /**
+     * AGENCY_ID的全路径，含agency_id
+     */
+    private String orgIdPath;
     /**
      * 政策级别，0市级；1区级；2街道级
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java

@@ -39,11 +39,11 @@ public class IcPolicyFormDTO implements Serializable {
     @NotBlank(message = "orgId不能为空",groups = UpdateUserInternalGroup.class)
     private String orgId;
 
-    /**
+    // /**
-     * AGENCY_ID的全路径，含agency_id
+    //  * AGENCY_ID的全路径，含agency_id
-     */
+    //  */
-    @NotBlank(message = "orgIdPath不能为空",groups = UpdateUserInternalGroup.class)
+    // @NotBlank(message = "orgIdPath不能为空",groups = UpdateUserInternalGroup.class)
-    private String orgIdPath;
+    // private String orgIdPath;
 
 
     /**