From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
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