From 2ea7c30be31b05877e8324edb85d08173e07a8c6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 09:57:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 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..1153f42 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>
@@ -54,6 +54,14 @@
* 是否经营包车(1=是，2=否)
*/
private Integer isCharter;
+ /**
+ * 是否经营顺风车（1=是，2=否）
+ */
+ private Integer isHitchRide;
+ /**
+ * 是否经营代驾（1=是，2=否）
+ */
+ private Integer isSubstituteDriving;
/**
* 快车提成方式(1=比例，2=固定)
*/
@@ -267,20 +275,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 +795,97 @@
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;
+ }
+
+ public Integer getIsHitchRide() {
+ return isHitchRide;
+ }
+
+ public void setIsHitchRide(Integer isHitchRide) {
+ this.isHitchRide = isHitchRide;
+ }
+
+ public Integer getIsSubstituteDriving() {
+ return isSubstituteDriving;
+ }
+
+ public void setIsSubstituteDriving(Integer isSubstituteDriving) {
+ this.isSubstituteDriving = isSubstituteDriving;
+ }
+
@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