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/shopXcx/api/vo/ActivitySignRecordVo.java |   23 +++--------------------
 1 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
index 3a64229..5a903a2 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
@@ -4,20 +4,12 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @ApiModel(value = "ActivitySignRecordVo", description = "签到明细")
 public class ActivitySignRecordVo {
-    /**
-     * userId
-     */
 
-
-
-    @ApiModelProperty(value ="userId")
-    private Long  userId;
-
+    @ApiModelProperty(value ="签到状态 1:已签到 2:未签到")
+    private int state;
     /**
      * 签到时间
      */
@@ -25,16 +17,7 @@
 
 
     @ApiModelProperty(value ="签到时间")
-    private Date  signTime;
-
-    /**
-     * 累计签到天数
-     */
-
-
-
-    @ApiModelProperty(value ="累计签到天数")
-    private Integer  cumulativeDay;
+    private String  signTime;
 
     /**
      * 活动主表ID

--
Gitblit v1.9.1