From 186e25fed2ba68e445a4cd8dffb0bde6b02af93a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 十二月 2025 11:56:28 +0800
Subject: [PATCH] 首页添加未过期的公告数量

---
 src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
index 8dc3ac4..74276a7 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -150,7 +150,8 @@
     private WarehouseTreeDto convertToShelfTreeDto(WarehouseGoodsShelves shelf) {
         WarehouseTreeDto dto = new WarehouseTreeDto();
         copyProperties(shelf, dto);
-        dto.setLabel(shelf.getGoodsShelvesName());
+//        dto.setLabel(shelf.getGoodsShelvesName());
+        dto.setLabel(shelf.getName());
         dto.setChildren(new ArrayList<>());
         return dto;
     }
@@ -161,7 +162,8 @@
     private WarehouseTreeDto convertToRowcolTreeDto(WarehouseGoodsShelvesRowcol rowcol) {
         WarehouseTreeDto dto = new WarehouseTreeDto();
         copyProperties(rowcol, dto);
-        dto.setLabel(rowcol.getStorey() + "-" + rowcol.getArrange());
+//        dto.setLabel(rowcol.getStorey() + "-" + rowcol.getArrange());
+        dto.setLabel(rowcol.getRow() + "-" + rowcol.getCol());
         dto.setChildren(new ArrayList<>());
         return dto;
     }

--
Gitblit v1.9.3