Merge branch 'score-shop' into xc-prd

Helius

2021-12-08 ef4ad171c46f615a5b719bac70c468b561bc08ac

 gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java

@@ -86,6 +86,8 @@
    BigDecimal money;

    @ApiModelProperty("积分数")

    BigDecimal collectScore;

    @ApiModelProperty("推广人电话号码")

    String tgrPhone;



    @ApiModelProperty("1:已删除 0：未删除")

    String delFlag;