Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceChargingConfigServiceImpl.java

@@ -12,7 +12,7 @@ import com.xy.utils.Beans;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -39,7 +39,7 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
     private MercService mercService;
 
     @PostMapping("list")
-    @ApiModelProperty("集合查询")
+    @ApiOperation("集合查询")
     public R<List<DeviceChargingConfigDto.Vo>> list(@RequestBody @Validated DeviceChargingConfigDto.SelectList selectList) {
         MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(selectList.getMercId())).getData();
         LambdaQueryWrapper<DeviceChargingConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceChargingConfig.class)
@@ -50,7 +50,7 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
     }
 
     @PostMapping("saveOrUpdate")
-    @ApiModelProperty("添加或修改")
+    @ApiOperation("添加或修改")
     public R saveOrUpdate(@RequestBody @Validated DeviceChargingConfigDto.SaveOrUpdate saveOrUpdate) {
         LocalDateTime now = LocalDateTime.now();
         MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(saveOrUpdate.getMercId())).getData();