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

zss

8 天以前 8a5ac1e030826485463c078cdde03a065b45a960

 src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java

@@ -9,7 +9,7 @@
@Data
public class WarehouseGoodsShelvesRowcolDto extends WarehouseGoodsShelvesRowcol {
    private String warehouseName;
    private String goodsShelvesName;
    private List<DocumentationDto> documentationList;
    private String name;
    private List<DocumentationDto> documentationDtoList;
    private String category;
}