From 80f6c17c34dae2c5f9f861e274f4e8d5e2394d5c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 二月 2026 18:00:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/PricingSetPriceDTO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/PricingSetPriceDTO.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/PricingSetPriceDTO.java
index 3dd6b79..575a6c8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/PricingSetPriceDTO.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/PricingSetPriceDTO.java
@@ -1,5 +1,6 @@
 package com.xiaopeng.operation.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,6 @@
     private Long id;
 
     @ApiModelProperty(value = "基础价格json配置", required = true, notes = "{\n" +
-            "  \"num3\": \"起步价数值1\",\n" +
             "  \"num4\": \"起步价数值2\",\n" +
             "  \"num5\": \"起步价数值3\",\n" +
             "  \"num6\": \"起步价数值4\",\n" +
@@ -93,7 +93,6 @@
             "    \"num7\": \"起步价数值5\"\n" +
             "  }\n" +
             "]")
-    @NotBlank(message = "起步价json配置不能为空")
     private String startingFareJson;
 
     @ApiModelProperty(value = "动态价格json配置", required = true, notes = "  {\n" +
@@ -109,4 +108,8 @@
             "  }")
     @NotBlank(message = "动态价格json配置不能为空")
     private String dynamicPricingJson;
+
+    @ApiModelProperty(value = "是否动态价格 0否 1是")
+    private Integer isDynamicPrice;
+
 }

--
Gitblit v1.7.1