Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

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