Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java

@@ -146,6 +146,8 @@

   @ApiModelProperty(value ="客服微信")
   private String  wechatImg;
   @ApiModelProperty(value ="客服电话")
   private String  customerPhone;
   
   /**
    * 积分数量