Merge branch 'jtwy' into dev_New

zss

昨天 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa

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