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/entity/ActivitySignRecord.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignRecord.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignRecord.java
index 9f00d8f..437d938 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignRecord.java
@@ -1,14 +1,11 @@
 package com.matrix.system.activity.entity;
 
-import com.matrix.core.pojo.EntityDTO;
-import com.matrix.system.score.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.matrix.core.anotations.Extend;
+import com.matrix.system.score.entity.BaseEntity;
+import lombok.Data;
 
 import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
 
 /**
  * @description 签到记录表
@@ -26,11 +23,11 @@
 
 	
 	/**
-	 * openID
+	 * userId
 	 */
 
 
-	private String  openId;
+	private Long  userId;
 	
 	/**
 	 * 签到时间

--
Gitblit v1.9.1