Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

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