Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/security/service/dto/AuthUserPhoneDto.java

@@ -20,7 +20,7 @@
    @ApiModelProperty(value = "用户名")
    private String username;

    @NotBlank
    @NotBlank(message = "验证码不能为空")
    @ApiModelProperty(value = "验证码")
    private String code;