Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-05 61fafb87c2ba69b28fd145a31b72782e528a57da

 src/main/java/com/xcong/excoin/common/system/dto/RegisterDto.java

@@ -26,7 +26,7 @@
    @NotBlank(message = "密码不能为空")
    private String password;

    @ApiModelProperty(value = "账号类型", notes = "1-手机 2-邮箱", example = "1")
    @ApiModelProperty(value = "账号类型 1-手机 2-邮箱", example = "1")
    @NotNull(message = "账号类型不能为空")
    private Integer type;