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

zss

2026-01-22 5507f1405049513051e5de4a570a6c9b6c1ddb64

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