From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeliveryItemService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeliveryItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeliveryItemService.java
index 1abc71d..a9507a7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeliveryItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeliveryItemService.java
@@ -11,5 +11,5 @@
 
 public interface DeliveryItemService extends IService<DeliveryItem> {
 
-//    R excelImport(MultipartFile file, Map<String, Object> hashMap, Long loginUserId) throws Exception;
+    R excelImport(MultipartFile file, Map<String, Object> hashMap, Long loginUserId) throws Exception;
 }

--
Gitblit v1.9.1