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

zss

20 小时以前 61683273be9457253f9d176313ac51bdb4d897bf

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