From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java |   93 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 79 insertions(+), 14 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
index 6492ee8..15af47a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -1,15 +1,15 @@
 package com.stylefeng.guns.modular.system.model;
 
-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.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -267,20 +267,29 @@
     private String scale;
     /**
      * 公司信息
+     *
      * @return
      */
     private String companyInfo;
-
+    
     private Integer paymentDays;
-
+    /**
+     * 中台企业编号
+     */
+    private String enterCode;
+    /**
+     * 中台新增标识(0=否,1=是)
+     */
+    private Integer enterNew;
+    
     private Integer version;
-
+    
     private String Spe;
     private String Taxi;
     private String SameLogistics;
     private String CrossLogistics;
     private String OnCall;
-
+    
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -778,25 +787,81 @@
     public void setScale(String scale) {
         this.scale = scale;
     }
-
+    
     public String getCompanyInfo() {
         return companyInfo;
     }
-
+    
     public void setCompanyInfo(String companyInfo) {
         this.companyInfo = companyInfo;
     }
-
+    
+    public String getEnterCode() {
+        return enterCode;
+    }
+    
+    public void setEnterCode(String enterCode) {
+        this.enterCode = enterCode;
+    }
+    
+    public String getSpe() {
+        return Spe;
+    }
+    
+    public void setSpe(String spe) {
+        Spe = spe;
+    }
+    
+    public String getTaxi() {
+        return Taxi;
+    }
+    
+    public void setTaxi(String taxi) {
+        Taxi = taxi;
+    }
+    
+    public String getSameLogistics() {
+        return SameLogistics;
+    }
+    
+    public void setSameLogistics(String sameLogistics) {
+        SameLogistics = sameLogistics;
+    }
+    
+    public String getCrossLogistics() {
+        return CrossLogistics;
+    }
+    
+    public void setCrossLogistics(String crossLogistics) {
+        CrossLogistics = crossLogistics;
+    }
+    
+    public String getOnCall() {
+        return OnCall;
+    }
+    
+    public void setOnCall(String onCall) {
+        OnCall = onCall;
+    }
+    
+    public Integer getEnterNew() {
+        return enterNew;
+    }
+    
+    public void setEnterNew(Integer enterNew) {
+        this.enterNew = enterNew;
+    }
+    
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
-
+    
     @Override
     public String toString() {
         return "TCompany{" +
-        "id=" + id +
-        ", isSpe=" + isSpe +
+                "id=" + id +
+                ", isSpe=" + isSpe +
         ", isTaxi=" + isTaxi +
         ", isCross=" + isCross +
         ", isCrossLogistics=" + isCrossLogistics +

--
Gitblit v1.7.1