Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 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;