From 8580866e175ad0050ee9c5ea3f757856fc242c39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 09 五月 2025 10:50:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
index aa38c5c..6cabb63 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
@@ -253,7 +253,45 @@
*/
@TableField("insertTime")
private Date insertTime;
+ /**
+ * 司机接单限制
+ */
+ @TableField("driverRestriction")
+ private Double driverRestriction;
+ /**
+ * 固定费用
+ */
+ @TableField("fixedDeduction")
+ private Double fixedDeduction;
+ /**
+ * 线上下单扣除
+ */
+ @TableField("percentageDeduction")
+ private Double percentageDeduction;
+ public Double getFixedDeduction() {
+ return fixedDeduction;
+ }
+
+ public void setFixedDeduction(Double fixedDeduction) {
+ this.fixedDeduction = fixedDeduction;
+ }
+
+ public Double getPercentageDeduction() {
+ return percentageDeduction;
+ }
+
+ public void setPercentageDeduction(Double percentageDeduction) {
+ this.percentageDeduction = percentageDeduction;
+ }
+
+ public Double getDriverRestriction() {
+ return driverRestriction;
+ }
+
+ public void setDriverRestriction(Double driverRestriction) {
+ this.driverRestriction = driverRestriction;
+ }
public Integer getId() {
return id;
}
--
Gitblit v1.7.1