Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java

@@ -52,7 +52,8 @@ public class PatrolRoutineWorkFormDTO implements Serializable {
     /**
      * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地
      */
-    private String isKeyPeopleLocate;
+    @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class)
+    private Integer isKeyPeopleLocate;
     /**
      * 重点人员现状
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java

@@ -78,7 +78,7 @@ public class PatrolRoutineWorkEntity extends BaseEpmetEntity {
 	/**
 	 * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地
 	 */
-	private String isKeyPeopleLocate;
+	private Integer isKeyPeopleLocate;
 
 	/**
 	 * 重点人员现状