Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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

@@ -22,6 +22,9 @@
   
   @ApiModelProperty(value = "连续签到天数")
   private Integer cumulativeDay;

   @ApiModelProperty(value = "数量")
   private Integer scoreCnt;
   
   @ApiModelProperty(value = "奖励类型")
   private String awardType;