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

935090232@qq.com

2021-05-16 8c7508388bad1234b731e0fc59afa095db0fda1b

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