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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

 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;

}