From 9af336a5be2483d67b5dbbf02d87e1e54185014f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 23 七月 2024 14:52:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
index 5f2fa60..865773d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
import java.util.Date;
@@ -11,6 +12,7 @@
* 用户红包记录
*/
@TableName("t_user_red_packet_record")
+@Data
public class UserRedPacketRecord {
/**
* 主键
@@ -23,11 +25,14 @@
*/
@TableField("money")
private Double money;
- /**
- * 过期时间
- */
- @TableField("expirationTime")
- private Date expirationTime;
+ @TableField("remainingAmount")
+
+ private Double remainingAmount;
+// /**
+// * 过期时间
+// */
+// @TableField("expirationTime")
+// private Date expirationTime;
/**
* 添加时间
*/
@@ -85,13 +90,13 @@
this.money = money;
}
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
+// public Date getExpirationTime() {
+// return expirationTime;
+// }
+//
+// public void setExpirationTime(Date expirationTime) {
+// this.expirationTime = expirationTime;
+// }
public Date getInsertTime() {
return insertTime;
@@ -162,7 +167,7 @@
return "UserRedPacketRecord{" +
"id=" + id +
", money=" + money +
- ", expirationTime=" + expirationTime +
+// ", expirationTime=" + expirationTime +
", insertTime=" + insertTime +
", companyId=" + companyId +
", state=" + state +
--
Gitblit v1.7.1