From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
index 8d96a90..2a1ef86 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
@@ -69,6 +69,9 @@
@ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍦板潃锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
private String takeShopAddress;
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鑱旂郴鐢佃瘽锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
+ private String takeShopPhone;
+
@ApiModelProperty(value = "鍙栦欢鍦扮偣锛堟棤鍙栦欢闂ㄥ簵鏃惰繑鍥烇紝鐢ㄦ埛鑷�夛級")
private String takeLocation;
@@ -110,6 +113,14 @@
@ApiModelProperty(value = "褰撳墠闂ㄥ簵瑙掕壊锛�1=瀛樹欢闂ㄥ簵锛�2=鍙栦欢闂ㄥ簵锛堜粎闂ㄥ簵绔繑鍥烇級")
private Integer shopRole;
+ // ---- 鍙告満淇℃伅 ----
+
+ @ApiModelProperty(value = "鍙告満濮撳悕锛堝紓鍦板瘎瀛樻湁鍙告満鏃惰繑鍥烇級")
+ private String driverName;
+
+ @ApiModelProperty(value = "鍙告満鐢佃瘽锛堝紓鍦板瘎瀛樻湁鍙告満鏃惰繑鍥烇級")
+ private String driverPhone;
+
// ---- 璇勪环 ----
@ApiModelProperty(value = "璇勪环鐘舵�侊細0=鏈瘎浠凤紱1=宸茶瘎浠�")
--
Gitblit v1.9.3