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

maven

9 天以前 dc3a872dd2f2cfcddd3db4e722efa376705482ec

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