Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-30 ff1ebb8f686b25c2383acb1efb79e7c01d78fc01

 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;