Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 eaad3c9d48cf9641726818c90741942b193484e2

 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;