From db85e062349683b3131726fe90dcc99d4aff35ba Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 13:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
index 2deee59..b637542 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
@@ -6,8 +6,7 @@
 
 public class WarehouseGoodsShelvesDto extends WarehouseGoodsShelves {
     private String warehouseName;
-    private String goodsShelvesName;
-//    private List<DocumentationDto> documentationList;
-    private List<WarehouseGoodsShelvesRowcolDto> warehouseGoodsShelvesRowcolList;
+    private String docName;
+    private String docNumber;
     private String category;
 }

--
Gitblit v1.9.3