From eeebf2d723433f916ba9c33cce92431165dd64c7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 10:04:39 +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/TOrderPrivateCar.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 5429df0..a2c2c8f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -205,7 +205,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -639,13 +639,7 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
--
Gitblit v1.7.1