From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/dao/dto/ConfirmArriveDTO.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/dto/ConfirmArriveDTO.java b/server/services/src/main/java/com/doumee/dao/dto/ConfirmArriveDTO.java
index 396b2c4..dc198d1 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/ConfirmArriveDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/ConfirmArriveDTO.java
@@ -19,7 +19,4 @@
     @ApiModelProperty(value = "璁㈠崟涓婚敭", required = true)
     private Integer orderId;
 
-    @NotNull(message = "闂ㄥ簵涓婚敭涓嶈兘涓虹┖")
-    @ApiModelProperty(value = "褰撳墠鎿嶄綔闂ㄥ簵涓婚敭", required = true)
-    private Integer shopId;
 }

--
Gitblit v1.9.3