From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
index ab9f539..abc2d20 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
@@ -64,6 +64,8 @@
private JSONObject contentExclusive;//独享
@ApiModelProperty("一口价规则")
private JSONObject contentPrice;//一口价
+ @ApiModelProperty("等待费规则")
+ private JSONObject waitPrice;//等待费
@ApiModelProperty("计价说明（拼车）")
private String fareTypeNote1;
@@ -362,4 +364,13 @@
}
return data;
}
+
+
+ public JSONObject getWaitPrice() {
+ return waitPrice;
+ }
+
+ public void setWaitPrice(JSONObject waitPrice) {
+ this.waitPrice = waitPrice;
+ }
}
--
Gitblit v1.7.1