From 11e55e11d3d3397cd2b54a65b2cda202be822296 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 30 四月 2026 09:21:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
index efa84de..46eab1f 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
@@ -81,15 +81,6 @@
private String dynamicPricingJson;
-// public XpPricingDynamicPricesVo getDynamicPricingJsonObj() {
-// if(StringUtils.isNotEmpty(dynamicPricingJson)){
-// return JSONObject.parseObject(dynamicPricingJson, XpPricingDynamicPricesVo.class);
-// }
-// return null;
-// }
-
-
-
@ApiModelProperty(value = "价格规则")
@TableField("price_rule")
private String priceRule;
@@ -99,4 +90,9 @@
@TableField("is_dynamic_price")
private Integer isDynamicPrice;
+
+ @ApiModelProperty(value = "合作商id")
+ @TableField("official_partner_id")
+ private Integer officialPartnerId;
+
}
--
Gitblit v1.7.1