From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index b916f82..df1b4d5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -13,7 +13,7 @@
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.User;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -67,7 +67,8 @@
R completeOrder(Long id, Long loginUserId);
- R getItemByContainer(Map<String, Object> params);
+ R getItemByContainer(Map<String, Object> params,User user);
+ R getItemByContainerArea(Map<String, Object> params,User user);
R getUnItemByContainer(Map<String, Object> params);
@@ -81,3 +82,4 @@
R generateTask(Map<String, Object> map, Long loginUserId);
}
+
--
Gitblit v1.9.1