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

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 0b8a34f..96842a4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -1,12 +1,7 @@
 package com.doumee.service.business.third;
 
-import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
+import com.doumee.core.tms.model.request.*;
+import com.doumee.core.tms.model.response.*;
 import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
 import com.doumee.core.wms.model.request.WmsBaseRequest;
 import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
@@ -39,8 +34,9 @@
      * @param param 鍙傛暟
      * @return TmsBaseResponse
      */
-    List<TmsOrderListResponse> orderList(TmsOrderListRequest param);
-
+    TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
+    List<TmsGisListResponse>  gisList(TmsGisListRequest param);
+    List<TmsCircleStatusResultListResponse>  getCicleStatusList(TmsCircleStatusListRequest param);
     /**
      * 鍚堝悓璇︽儏鎺ュ彛
      * @param param 鍙傛暟

--
Gitblit v1.9.3