From ba7ef6a2cfeff873da48469cc775c5f928ea45e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:38 +0800
Subject: [PATCH] Merge branch 'ty_fix' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
index 661707f..7b7d959 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
+++ b/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;
 	

--
Gitblit v1.9.1