From 21db21a114356e0704a3483c1a3f22b96ea6658b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 16:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
index bdc3db8..6fb1263 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
@@ -16,6 +16,11 @@
 	 * 主键
 	 */
 	private Long  id;
+	@ApiModelProperty(value ="活动今日是否已参与 1:未参与 2:已参与")
+    private int joinState;
+
+	public static final int JOINSTATE_NOTSIGN = 1;
+	public static final int JOINSTATE_SIGN = 2;
 	
 	@ApiModelProperty(value ="活动名称")
     private String actName;

--
Gitblit v1.9.1