From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:15:56 +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 |    5 +++++
 1 files changed, 5 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 865773d..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
@@ -44,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