From df35c666ff8342343c82735ee25c5f04ae0d054c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 02 九月 2025 15:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim_ywx
---
src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
index 0f82839..2bff39e 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
@@ -9,8 +9,7 @@
@Data
public class WarehouseGoodsShelvesRowcolDto extends WarehouseGoodsShelvesRowcol {
private String warehouseName;
- private String goodsShelvesName;
- private String docName;
- private String docNumber;
+ private String name;
+ private List<DocumentationDto> documentationDtoList;
private String category;
}
--
Gitblit v1.9.3