From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 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 bc7496a..a0e66fb 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
@@ -1,7 +1,10 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
/**
* @author 姹熻箘韫�
@@ -10,37 +13,43 @@
@Data
@ApiModel("tms鍚堝悓璇︽儏杩斿洖鍙傛暟")
public class TmsOrderInfoResponse {
- /**
- {
- "code": 0,
- "data": {
- "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 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; //
- private String plateName; //": "鐨朇C2585",
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
+ private String contractNumber ; //鍚堝悓鍙�
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
+ private String deliveryEnterprise ; //鍙戣揣鍦�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
+ private String receiveEnterprise ; //鍒拌揣鍦�
+// @ApiModelProperty(value = "杞︾墝鍙�" )
+// private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
+ private String orderStatus ; //褰撳墠杩愯緭鍗曠姸鎬�
+ @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
+ private String ncCreateDate; // 鍒跺崟鏃堕棿
+ @ApiModelProperty(value = "杩愯緭濡傛湡" )
+ private String transportDate; //
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+ private String transportCode; //
+ @ApiModelProperty(value = "鍙告満濮撳悕" )
+ private String driverName; //
+ @ApiModelProperty(value = "鍙告満鐢佃瘽" )
+ private String driverTel; //
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+ private String orderStatusDesc; //
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String plateName; //": "鐨朇C2585",
+ @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; // 璁″垝鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "gis杞ㄨ抗缁忕含搴﹂泦鍚�" )
+ private List<TmsGisListResponse> gisList;
+ @ApiModelProperty(value = "鐢熷懡鍛ㄦ湡闆嗗悎" )
+ private List<TmsCircleStatusResultListResponse> cicleStatusList;
}
--
Gitblit v1.9.3