From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java b/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
index eb70d14..93108d7 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
@@ -6,6 +6,7 @@
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.List;
/**
* 棰勮鏃舵晥閰嶇疆淇濆瓨璇锋眰
@@ -20,19 +21,32 @@
@NotNull(message = "鍩庡競涓婚敭涓嶈兘涓虹┖")
private Integer cityId;
- @ApiModelProperty(value = "璧烽�侀噷绋�(鍏噷)", required = true, example = "10")
- @NotNull(message = "璧烽�侀噷绋嬩笉鑳戒负绌�")
- private String startDistance;
+ @ApiModelProperty(value = "鏃舵晥閰嶇疆鍒楄〃锛坒ieldA=1鏍囬�熻揪锛宖ieldA=2鏋侀�熻揪锛�")
+ @NotNull(message = "鏃舵晥閰嶇疆鍒楄〃涓嶈兘涓虹┖")
+ private List<EstimatedDeliveryItem> items;
- @ApiModelProperty(value = "璧烽�佹椂闀�", required = true, example = "2")
- @NotNull(message = "璧烽�佹椂闀夸笉鑳戒负绌�")
- private String startTime;
+ @Data
+ @ApiModel("棰勮鏃舵晥閰嶇疆椤�")
+ public static class EstimatedDeliveryItem implements Serializable {
- @ApiModelProperty(value = "缁�侀噷绋�(鍏噷)", required = true, example = "5")
- @NotNull(message = "缁�侀噷绋嬩笉鑳戒负绌�")
- private String continueDistance;
+ @ApiModelProperty(value = "绫诲瀷锛�1=鏍囬�熻揪锛�2=鏋侀�熻揪", required = true, example = "1")
+ @NotNull(message = "绫诲瀷涓嶈兘涓虹┖")
+ private Integer fieldA;
- @ApiModelProperty(value = "缁�佹椂闀�", required = true, example = "1")
- @NotNull(message = "缁�佹椂闀夸笉鑳戒负绌�")
- private String continueTime;
+ @ApiModelProperty(value = "璧烽�侀噷绋�(鍏噷)", required = true, example = "10")
+ @NotNull(message = "璧烽�侀噷绋嬩笉鑳戒负绌�")
+ private String startDistance;
+
+ @ApiModelProperty(value = "璧烽�佹椂闀�", required = true, example = "2")
+ @NotNull(message = "璧烽�佹椂闀夸笉鑳戒负绌�")
+ private String startTime;
+
+ @ApiModelProperty(value = "缁�侀噷绋�(鍏噷)", required = true, example = "5")
+ @NotNull(message = "缁�侀噷绋嬩笉鑳戒负绌�")
+ private String continueDistance;
+
+ @ApiModelProperty(value = "缁�佹椂闀�", required = true, example = "1")
+ @NotNull(message = "缁�佹椂闀夸笉鑳戒负绌�")
+ private String continueTime;
+ }
}
--
Gitblit v1.9.3