java/zhihuishenqu.git

			@@ -4,6 +4,7 @@
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import javax.validation.constraints.NotBlank;
			import javax.validation.constraints.NotEmpty;
			import javax.validation.constraints.Pattern;

			@@ -22,7 +23,7 @@
			private String oldPassword;

			@ApiModelProperty("新密码")
			@NotEmpty(message = "新密码不能为空")
			@NotBlank(message = "新密码不能为空")
			@Pattern(message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
			private String newPassword;