From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期一, 04 十一月 2024 14:31:31 +0800 Subject: [PATCH] 合并代码,解决冲突 --- src/main/java/com/zy/asrs/service/MobileService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java index 6c6f79e..13a57fd 100644 --- a/src/main/java/com/zy/asrs/service/MobileService.java +++ b/src/main/java/com/zy/asrs/service/MobileService.java @@ -28,4 +28,6 @@ void nodePakout(NodePakoutParam param, User user); void modifyWrkDetl(List<WrkDetl> wrkDetls, List<ModifyPakoutParam.CA> params, Long userId); + + void nodePakinNoComb(CombParam param); } -- Gitblit v1.9.1