Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-08-25 3e430a9b6a5d9132703371ace56429f597c91def

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

@@ -86,10 +86,12 @@
    BigDecimal money;

    @ApiModelProperty("积分数")

    BigDecimal collectScore;

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

    String tgrPhone;



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

    String delFlag;

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

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

    Integer orderStatus3;

    Integer orderStatus5;

     //入库重量