From caad86093475a38d79886eb8e77aa288bfb74d89 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 05 六月 2024 16:53:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
index fb97a7c..a1f3f31 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -53,6 +53,10 @@
*/
private Integer isCharter;
/**
+ * 是否经营接送机(1=是，2=否)
+ */
+ private Integer isTransfer;
+ /**
* 专车提成方式(1=比例，2=固定)
*/
private Integer isSpeFixedOrProportional;
@@ -69,6 +73,10 @@
*/
private Integer isSameLogisticsFixedOrProportional;
/**
+ * 接送机提成方式(1=比例，2=固定)
+ */
+ private Integer isTransferFixedOrProportional;
+ /**
* 专车提成数值
*/
private BigDecimal speMoney;
@@ -84,6 +92,10 @@
* 同城物流
*/
private BigDecimal sameLogisticsMoney;
+ /**
+ * 接送机提成数值
+ */
+ private BigDecimal transferMoney;
/**
* 是否需要摆渡车(1=是，2=否)
*/
@@ -242,6 +254,30 @@
//身份证反面
private String idCardReverse;
+ public Integer getIsTransfer() {
+ return isTransfer;
+ }
+
+ public void setIsTransfer(Integer isTransfer) {
+ this.isTransfer = isTransfer;
+ }
+
+ public Integer getIsTransferFixedOrProportional() {
+ return isTransferFixedOrProportional;
+ }
+
+ public void setIsTransferFixedOrProportional(Integer isTransferFixedOrProportional) {
+ this.isTransferFixedOrProportional = isTransferFixedOrProportional;
+ }
+
+ public BigDecimal getTransferMoney() {
+ return transferMoney;
+ }
+
+ public void setTransferMoney(BigDecimal transferMoney) {
+ this.transferMoney = transferMoney;
+ }
+
public String getIdCardPositive() {
return idCardPositive;
}
--
Gitblit v1.7.1