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

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

 src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java

@@ -21,7 +21,7 @@
public interface WarehouseGoodsShelvesMapper extends BaseMapper<WarehouseGoodsShelves> {

    List<WarehouseGoodsShelvesDto> findList(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
    List<WarehouseGoodsShelves> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
    List<WarehouseGoodsShelvesDto> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
}