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

jyy

2021-07-31 a27c45a501d059bca456bac7b561786232d3ecf3

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