Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 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;