From 4f39e676277d7a66e13d172288032ce16bb18e8c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 22 四月 2026 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂
---
src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java | 7 ++++---
1 files changed, 4 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..4b103bb 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
@@ -3,14 +3,15 @@
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
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