Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 7ef344dbe8fa92d479477d3cec483872f8080b77

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

@@ -12,7 +12,9 @@
    * 主键
    */
   private Long  id;
			
   //活动类型
   private int  actType;

   @ApiModelProperty(value = "用户")
   private String nickName;