From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
index 971b748..6c01dea 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -7,10 +7,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tms.domain.TmsDriverDispatch;
 import com.ruoyi.tms.domain.TmsPayableFee;
-import com.ruoyi.tms.domain.vo.DpDriverDispatchItemVo;
-import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
-import com.ruoyi.tms.domain.vo.DpItineraryLogVo;
-import com.ruoyi.tms.domain.vo.TmsDispatchOrderImport;
+import com.ruoyi.tms.domain.vo.*;
 
 /**
  * 璋冨害鍗曠鐞哠ervice鎺ュ彛
@@ -98,6 +95,7 @@
      * @return 缁撴灉
      */
     public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
     public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
 
     /**

--
Gitblit v1.8.0