From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +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 | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 c76f88b..1403d69 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,6 +25,9 @@
*/
@TableField("money")
private Double money;
+ @TableField("remainingAmount")
+
+ private Double remainingAmount;
// /**
// * 过期时间
// */
@@ -39,6 +44,11 @@
@TableField("companyId")
private Integer companyId;
/**
+ * 是否为后台发放的红包 0否1是
+ */
+ @TableField("isGrant")
+ private Integer isGrant;
+ /**
* 状态（0=临时，1=未使用，2=已使用，3=已过期）
*/
@TableField("state")
--
Gitblit v1.7.1