From a36535db12500082c443ef86a0c53bc039f5b615 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 26 九月 2022 18:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
index c143363..8988412 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
@@ -29,7 +29,9 @@
private DeviceOperationLogService deviceOperationLogService;
@GetMapping(value = "/getLogList")
- public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO, @RequestParam String poleCode, @RequestParam String operation) {
+ public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO
+ , @RequestParam(value = "poleCode", required = false) String poleCode
+ , @RequestParam(value = "operation", required = false) String operation) {
if (!permissionConfig.check(MenuEnum.LOG_RECORD.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
--
Gitblit v1.9.3