Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

 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;
}