From d3f42e78332d6192f457c29d4cb46789d2f1d975 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 28 十一月 2024 15:46:31 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
index 3f2de40..ccaf2ec 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
@@ -1,11 +1,14 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -17,6 +20,7 @@
* @since 2020-09-24
*/
@TableName("t_order_logistics")
+@Data
public class TOrderLogistics extends Model<TOrderLogistics> {
private static final long serialVersionUID = 1L;
@@ -169,7 +173,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -256,6 +260,11 @@
private String bindId;
private String tripId;
+ /**
+ * 争议订单（0=否，1=是）
+ */
+ @TableField("isDispute")
+ private Integer isDispute;
public Integer getOldState() {
return oldState;
@@ -553,13 +562,6 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
@@ -729,6 +731,22 @@
this.tripId = tripId;
}
+ public String getRedPacketId() {
+ return redPacketId;
+ }
+
+ public void setRedPacketId(String redPacketId) {
+ this.redPacketId = redPacketId;
+ }
+
+ public Integer getIsDispute() {
+ return isDispute;
+ }
+
+ public void setIsDispute(Integer isDispute) {
+ this.isDispute = isDispute;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1