Merge remote-tracking branch 'origin/master' into hckx

maven

2 天以前 3fd5bd656683c482141b13cfdb953d17ba377f1f

 src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java

@@ -23,5 +23,5 @@

    boolean deleteByIds(List<Long> ids);

    List<WarehouseGoodsShelves> findList(WarehouseGoodsShelves warehouseGoodsShelves);
    List<WarehouseGoodsShelvesDto> findList(WarehouseGoodsShelves warehouseGoodsShelves);
}