From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
index 417157d..fde4887 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -1,6 +1,7 @@
 package com.doumee.core.tms.model.response;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -27,13 +28,36 @@
          "message": "鎿嶄綔鎴愬姛"
      }
      */
+    @ApiModelProperty(value = "鍚堝悓鍙�" )
     private String    contractNumber; //	鍚堝悓鍙�
+    @ApiModelProperty(value = "鍙戣揣鍦�" )
     private String    fromRepertoty; //	鍙戣揣鍦�
+    @ApiModelProperty(value = "鍒拌揣鍦�" )
     private String   toRepertoty	; //鍒拌揣鍦�
-    private String   plateNumber; //	杞︾墝鍙�	鍚堝悓鏈厤杞藉垯鏃�
+    @ApiModelProperty(value = "杞︾墝鍙�" )
+    private String   plateName; //	杞︾墝鍙�	鍚堝悓鏈厤杞藉垯鏃�
+    @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
     private String    orderStatus; //	褰撳墠杩愯緭鍗曠姸鎬�
+    @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
     private String  ncCreateDate; //	鍒跺崟鏃堕棿
-
-
+    @ApiModelProperty(value = "鍙戣揣鍦�" )
+    private String   deliveryEnterprise; //	鍙戣揣鍦�	鍙戣揣浠撳簱鍚嶇О
+    @ApiModelProperty(value = "鍒拌揣鍦�" )
+    private String   receiveEnterprise; //		鍒拌揣鍦�	鍗歌揣浠撳簱鍚嶇О
+    @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+    private String    transportCode; //		杩愯緭鍗曞彿	鍙兘涓虹┖锛堟棤杩愯緭鍗曠殑鎯呭喌锛�
+    @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+    private String    orderStatusDesc; //		鐘舵�佹弿杩�
+    @ApiModelProperty(value = "鍙戣揣鍦扮含搴�" )
+    private String    deliveryLon; //		鐘舵�佹弿杩�
+    @ApiModelProperty(value = "鍙戣揣鍦扮粡搴�" )
+    private String    deliveryLat; //		鐘舵�佹弿杩�
+    @ApiModelProperty(value = "鏀惰揣鍦扮含搴�" )
+    private String    receiveLon; //		鐘舵�佹弿杩�
+    @ApiModelProperty(value = "鏀惰揣鍦扮粡搴�" )
+    private String    receiveLat; //		鐘舵�佹弿杩�
+    @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
+    private String    plannedArrivedDate; //		鐘舵�佹弿杩�
+    private long timeStamp;//鏃堕棿鎴�
 
 }

--
Gitblit v1.9.3