From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 26fadff..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,5 +1,6 @@
 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;
@@ -259,6 +260,11 @@
     private String bindId;
     
     private String tripId;
+    /**
+     * 争议订单(0=否,1=是)
+     */
+    @TableField("isDispute")
+    private Integer isDispute;
 
     public Integer getOldState() {
         return oldState;
@@ -725,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