From c0b3ad18633abfabd96b70bb2de7c8b3095cd48b Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 17:36:30 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java index 4293bf3..0f45ece 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java @@ -6,8 +6,6 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; -import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; -import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import org.springframework.web.multipart.MultipartFile; @@ -18,7 +16,7 @@ public interface AsnOrderItemService extends IService<AsnOrderItem> { - R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception; + R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception; boolean fieldsSave(Map<String, Object> params); -- Gitblit v1.9.1