Merge branch 'master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceAlgorithmChargingController.java

@@ -2,8 +2,6 @@ package com.xy.controller;
 
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceAlgorithmChargingDto;
-import com.xy.dto.DeviceAlgorithmChargingHistoryDto;
-import com.xy.service.DeviceAlgorithmChargingHistoryServiceImpl;
 import com.xy.service.DeviceAlgorithmChargingServiceImpl;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.PageBean;
@@ -16,17 +14,17 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @AllArgsConstructor
-@Api(tags = "小程序-设备算法计费历史表")
+@Api(tags = "小程序-设备算法计费表")
 @RestMappingController("merc-mini/device-algorithm-charging")
 public class DeviceAlgorithmChargingController {
 
-    private DeviceAlgorithmChargingHistoryServiceImpl deviceAlgorithmChargingHistoryService;
+    private DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
 
     @PostMapping("page")
     @ApiOperation("分页查询")
-    public R<PageBean<DeviceAlgorithmChargingHistoryDto.Vo>> page(@RequestBody DeviceAlgorithmChargingHistoryDto.Page page) {
+    public R<PageBean<DeviceAlgorithmChargingDto.Vo>> page(@RequestBody @Validated DeviceAlgorithmChargingDto.Page page) {
         page.setMercId(MercAuthUtils.getMercId());
-        return deviceAlgorithmChargingHistoryService.page(page);
+        return deviceAlgorithmChargingService.page(page);
     }
 
 }