From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
index 716c37b..f412829 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
@@ -15,23 +15,34 @@
          "code": 0,
          "data": [
              {
-                 "ncCreateDate": "2024-09-10 08:20:04",
-                 "toRepertotyName": "鑺滄箹甯傜儫鑽夊叕鍙镐粨搴�",
-                 "contractNumber": "112895169",
-                 "orderStatus": "鍒拌揪鍗歌揣鍦�",
-                 "fromRepertotyName": "鑺滄箹鎴愬搧搴�",
-                 "plateNumber": "鐨朆25010"
+     "contractNumber": "112718591",
+     "ncCreateDate": "2024-06-20 09:08:01",
+     "deliveryEnterprise": "铓屽煚鎴愬搧搴�",
+     "receiveEnterprise": "瀹垮窞甯傚嵎鐑熼厤閫佷腑蹇�",
+     "transportCode": "39828",
+     "transportDate": "2024-06-20 09:04:46.0",
+     "driverName": "鐜嬩粯鍏�",
+     "driverTel": "19955211695",
+     "plateName": "鐨朇C2585",
+     "orderStatus": "5",
+     "orderStatusDesc": "鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�"
              }
          ],
          "message": "鎿嶄綔鎴愬姛"
      }
      */
  
-    private String   contratNumber	; //鍚堝悓鍙�
-    private String   fromRepertotyName	; //鍙戣揣鍦�
-    private String    toRepertoty	; //鍒拌揣鍦�
+    private String   contractNumber	; //鍚堝悓鍙�
+    private String   deliveryEnterprise	; //鍙戣揣鍦�
+    private String    receiveEnterprise	; //鍒拌揣鍦�
     private String    plateNumber; //	杞︾墝鍙�	鍚堝悓鏈厤杞藉垯鏃�
     private String   orderStatus	; //褰撳墠杩愯緭鍗曠姸鎬�
     private String   ncCreateDate; //	鍒跺崟鏃堕棿
+    private String      transportDate; //
+    private String      transportCode; //
+    private String     driverName; //
+    private String           driverTel; //
+    private String            orderStatusDesc; //
+
 
 }

--
Gitblit v1.9.3