From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java |    7 ++++++-
 1 files changed, 6 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 06f33bf..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;
 	
@@ -22,6 +24,9 @@
 	
 	@ApiModelProperty(value = "连续签到天数")
 	private Integer cumulativeDay;
+
+	@ApiModelProperty(value = "数量")
+	private Integer scoreCnt;
 	
 	@ApiModelProperty(value = "奖励类型")
 	private String awardType;

--
Gitblit v1.9.1