From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8b6a223..fc62677 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -58,13 +58,13 @@
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
result.add(map);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
- for (Integer siteId : pickOutSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
- }
+// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+// for (Integer siteId : pickOutSite) {
+// Map<String, Object> map = new HashMap<>();
+// map.put("siteId", siteId);
+// map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+// result.add(map);
+// }
return R.ok().add(result);
}
--
Gitblit v1.9.1