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

gongchunyi

昨天 1bc0c6c7842e29711e576e58b0aca00fabd92df0

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