From d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 11:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁
---
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