Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java

@@ -31,5 +31,7 @@
   
   @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）")
   private int  awardRule;
   @ApiModelProperty(value ="是否已领取（1：待领取2:已领取）")
   private int  state;

}