Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 8b2e015759d11561638bdc0ecae070557b387451

 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;
   
   /**
    * 积分数量