From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +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/OperationConfigDTO.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/dto/OperationConfigDTO.java b/server/services/src/main/java/com/doumee/dao/dto/OperationConfigDTO.java
index 52d541d..767ede1 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/OperationConfigDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/OperationConfigDTO.java
@@ -46,4 +46,31 @@
     @ApiModelProperty(value = "榛樿閰嶉�佽寖鍥�(km)", required = true)
     private String defaultDeliveryRange;
 
+    @ApiModelProperty(value = "鍗冲皢鍒拌揪鍙栦欢鏃堕棿鎻愬墠閫氱煡(鍒嗛挓)", required = true)
+    private String arrivalPickUpTime;
+
+    @ApiModelProperty(value = "鍏佽鎿嶄綔鍗婂緞(m)", required = true)
+    private String operationRadius;
+
+    @ApiModelProperty(value = "涓嬪崟婊娆¤禒閫佷紭鎯犲埜-璁㈠崟娆℃暟")
+    private String orderCouponOrderCount;
+
+    @ApiModelProperty(value = "涓嬪崟婊娆¤禒閫佷紭鎯犲埜-鑷冲璧犻�佹鏁�")
+    private String orderCouponGiftCount;
+
+    @ApiModelProperty(value = "涓嬪崟婊娆¤禒閫佷紭鎯犲埜-璧犻�佷紭鎯犲埜ID锛堝涓互,鍒嗗壊锛�")
+    private String orderCouponId;
+
+    @ApiModelProperty(value = "娉ㄥ唽婊骞磋禒閫佷紭鎯犲埜-娉ㄥ唽骞存暟")
+    private String registerCouponYears;
+
+    @ApiModelProperty(value = "娉ㄥ唽婊骞磋禒閫佷紭鎯犲埜-鑷冲璧犻�佹鏁�")
+    private String registerCouponGiftCount;
+
+    @ApiModelProperty(value = "娉ㄥ唽婊骞磋禒閫佷紭鎯犲埜-璧犻�佷紭鎯犲埜ID锛堝涓互,鍒嗗壊锛�")
+    private String registerCouponId;
+
+    @ApiModelProperty(value = "鏂版敞鍐岀敤鎴疯禒閫佷紭鎯犲埜ID锛堝涓互,鍒嗗壊锛�")
+    private String registerGiftCouponIds;
+
 }

--
Gitblit v1.9.3