From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
index 71e4a00..679a554 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InboundOrderController.java
@@ -252,17 +252,17 @@
@AutoLog(value = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱")
@ApiOperation(value = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱", notes = "宸ュ叿鍏ュ簱-鏂板鍏ュ簱")
@PostMapping("/addInStorage")
- public Result<?> addInStorage(@RequestBody JSONObject jSONObject) {
- inboundOrderService.addInStorage(jSONObject);
- return Result.OK("鎿嶄綔鎴愬姛");
+ public Result<List<Map<String,String>>> addInStorage(@RequestBody JSONObject jSONObject) {
+ List<Map<String,String>> result = inboundOrderService.addInStorage(jSONObject);
+ return Result.OK(result);
}
@AutoLog(value = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�")
@ApiOperation(value = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�", notes = "宸ュ叿鍏ュ簱-鐢宠鍗曞叆搴�")
@PostMapping("/addApplyInStorage")
- public Result<?> addApplyInStorage(@RequestBody JSONObject jSONObject) {
- inboundOrderService.addApplyInStorage(jSONObject);
- return Result.OK("鎿嶄綔鎴愬姛");
+ public Result<List<Map<String,String>>> addApplyInStorage(@RequestBody JSONObject jSONObject) {
+ List<Map<String,String>> result = inboundOrderService.addApplyInStorage(jSONObject);
+ return Result.OK(result);
}
}
--
Gitblit v1.9.3