java/zhihuishenqu.git

			@@ -6,6 +6,8 @@
			import javax.validation.constraints.Pattern;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			import com.panzhihua.common.validated.AddGroup;

			import io.swagger.annotations.ApiModel;
			@@ -27,8 +29,8 @@
			private String account;

			@ApiModelProperty("密码")
			@Pattern(groups = {AddGroup.class}, message = "【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",
			regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
			@Pattern(groups = {AddGroup.class}, message = "密码强度过低，请将密码长度设置为8-16位，且包含字母、数字、字符。",
			regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&.`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&.`~()-+=]+$)(?![0-9\\W_!@#$%^.&`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&.`~()-+=]{8,16}$")
			private String password;

			@ApiModelProperty("用户名称")
			@@ -36,6 +38,7 @@
			private String name;

			@ApiModelProperty("角色")
			@JsonSerialize(using = ToStringSerializer.class)
			@Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
			private Long roleId;

			@@ -57,6 +60,7 @@
			private Long communityId;

			@ApiModelProperty(value = "用户主键")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long userId;

			@ApiModelProperty(value = "当前页数")
			@@ -94,11 +98,18 @@
			private String areaCode;

			@ApiModelProperty(value = "街道id")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long streetId;

			@ApiModelProperty(value = "三社账户类型 1街道 2社会组织 3社会组织成员")
			private Integer socialType;

			@ApiModelProperty("社会组织id")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long orgId;

			@ApiModelProperty("绑定单位")
			private String relationName;

			private String appid;
			}