From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 e3ae3d1..d43dbf6 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
@@ -31,5 +31,7 @@
 	
 	@ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）")
 	private int  awardRule;
+	@ApiModelProperty(value ="是否已领取（1：待领取2:已领取）")
+	private int  state;
 
 }

--
Gitblit v1.9.1