From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java
index dfc9def..271ef12 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java
@@ -65,10 +65,10 @@
}
/**
- * 鍒犻櫎涓绘満
+ * 涓绘満鍒楄〃
*/
- @GetMapping("/getList/{keyword}")
- public ResponseVO<Object> getInterphoneHostList(BaseConditionVO baseConditionVO, @PathVariable String keyword) {
+ @GetMapping("/getList")
+ public ResponseVO<Object> getInterphoneHostList(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword",required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.FOR_HELP_MANAGER.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
--
Gitblit v1.9.3