From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 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