From 20be31f2cbfab45fdae0fa8c6b887c5ecd6e30b4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 14:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index 70c7f05..971bc71 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -69,7 +69,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@RequiresPermissions("business:device:query")
+ @RequiresPermissions("business:device:query")
public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap) {
return ApiResponse.success(deviceService.findPage(pageWrap));
}
@@ -87,4 +87,11 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(deviceService.findById(id));
}
+
+ @ApiOperation("鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍")
+ @PostMapping("/getList")
+ @RequiresPermissions("business:device:query")
+ public ApiResponse findList(@RequestBody Device device) {
+ return ApiResponse.success(deviceService.findIdAndNameList(device));
+ }
}
--
Gitblit v1.9.3