Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

xiaoyong931011

2021-09-26 7b4027c1ca254f7ab192cef2b40cbbbfa090e0d2

 src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java

@@ -54,4 +54,10 @@
    public static final int ACCOUNTSTATUS_Y = 1;
    public static final int ACCOUNTSTATUS_N = 2;

    @ApiModelProperty(value = "是否设置收款方式", example = "1是2否")
    private Integer hasPayment = 2;

    @ApiModelProperty(value = "是否设置交易密码", example = "1是2否")
    private Integer hasTradePwd = 2;

}