From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
index 2973106..da6234f 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
@@ -48,8 +48,12 @@
     private String   receiveLat; //		鍗歌揣浠撳簱绾害
     @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
     private String   plannedArrivedDate; //		璁″垝鍒拌揪鏃堕棿
+    @ApiModelProperty(value = "鏄惁瓒呭簱瀛� 0闈炶秴搴撳瓨 1:瓒呭簱瀛�" )
+    private Integer overStock	;
     @ApiModelProperty(value = "gis杞ㄨ抗缁忕含搴﹂泦鍚�" )
     private List<TmsGisListResponse> gisList;
+    @ApiModelProperty(value = "瑙勬牸鍟嗗搧鏄庣粏" )
+    private List<TmsOrderDetailVOResponse> orderDetailVOList;
     @ApiModelProperty(value = "鐢熷懡鍛ㄦ湡闆嗗悎" )
     private List<TmsCircleStatusResultListResponse> cicleStatusList;
 }

--
Gitblit v1.9.3