From 122f2bd2fe7ee3efe81b27ab3ec500a591799961 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 14 Sep 2023 09:36:16 +0800
Subject: [PATCH] updates

---
 .../java/com/example/zxweb/controller/DeviceController.java     | 2 +-
 src/main/resources/templates/index.html                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/zxweb/controller/DeviceController.java b/src/main/java/com/example/zxweb/controller/DeviceController.java
index f51195a..9bfb630 100644
--- a/src/main/java/com/example/zxweb/controller/DeviceController.java
+++ b/src/main/java/com/example/zxweb/controller/DeviceController.java
@@ -31,7 +31,7 @@ public class DeviceController {
     @GetMapping(value = "/list")
     public Result<?> list(@RequestParam(value = "page",defaultValue = "1")Integer page,@RequestParam(value = "limit",defaultValue = "10")Integer limit){
         LambdaQueryWrapper<ZxDevice> queryWrapper=new LambdaQueryWrapper<>();
-        return null;
+        return Result.ok(zxDeviceService.list(queryWrapper));
     }
 
 
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index cb67482..0da27b5 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -136,7 +136,7 @@
     </div>
 </script>
 <script>
-var pageNum=2;
+var pageNum=1;
 var pageSize=10;
 var total=0;
 var laypage;