Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-12 1f27afeb9a001ef9df74011ab4ab2a64a3f2c5db

 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;

}