From 36a2d9a19b0b9ca2209555f6479ae1ef0198efd3 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:35:12 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
index 5c68bca..f358c8b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
@@ -1,6 +1,7 @@
 package com.ycl.controller.epuipment;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
@@ -35,11 +36,11 @@
 
     @GetMapping("/query")
     @ApiOperation("鏌ヨ")
-    @LogSave
-    public CommonResult<Page<HandheldTerminalVo>> search(@RequestParam(required = false) Integer size,
-                                                         @RequestParam(required = false) Integer current,
-                                                         @RequestParam(required = false) Short state) {
-        return CommonResult.success(handheldTerminalService.search(size, current, state));
+    @LogSave(operationType = "鎵嬫寔璁惧绠$悊", contain = "鏌ヨ")
+    public CommonResult<IPage<HandheldTerminalVo>> search(@RequestParam(required = true) Integer currentPage,
+                                                          @RequestParam(required = true) Integer pageSize,
+                                                          @RequestParam(required = false) Short state) {
+        return CommonResult.success(handheldTerminalService.search(pageSize, currentPage, state));
     }
 
     @PostMapping("/add")

--
Gitblit v1.8.0