Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-21 81d9838b3ab55e66cd3553ba079157e27b09933c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java

@@ -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;