Merge branch 'master' into test

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

@@ -9,7 +9,9 @@ import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @AllArgsConstructor
 @Api(tags = "小程序-设备计费历史表")
@@ -20,7 +22,7 @@ public class DeviceChargingHistoryController {
 
     @PostMapping("page")
     @ApiOperation("分页查询")
-    public R<PageBean<DeviceChargingHistoryDto.Vo>> page(DeviceChargingHistoryDto.Page page) {
+    public R<PageBean<DeviceChargingHistoryDto.Vo>> page(@RequestBody @Validated DeviceChargingHistoryDto.Page page) {
         page.setMercId(MercAuthUtils.getMercId());
         return deviceChargingHistoryService.page(page);
     }