From 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 05 六月 2025 15:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

---
 src/main/java/com/zy/asrs/controller/BasWhsController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index 2de999b..b57ce2f 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -113,7 +113,7 @@
         List<Map<String, Object>> result = new ArrayList<>();
         for (BasWhs basWhs : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
-            map.put("id", basWhs.getId());
+            map.put("id", basWhs.getIdentifying());
             map.put("value", basWhs.getWhsDesc());
             result.add(map);
         }

--
Gitblit v1.9.1