From ed32b4831acf1612d23015d85ff4a14db7f9f77d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 16 七月 2025 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 69a1a9f..c3df8e0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -116,10 +116,11 @@
@AutoLog(value = "璁惧琛�-璁惧鐩戞帶鍒楄〃")
@ApiOperation(value = "璁惧琛�-璁惧鐩戞帶鍒楄〃", notes = "璁惧琛�-璁惧鐩戞帶鍒楄〃")
@GetMapping(value = "/queryEquipmentMonitorList")
- public Result<List<MdcEquipmentMonitor>> queryEquipmentMonitorList(@RequestParam(name = "key", required = false) String key) {
+ public Result<List<MdcEquipmentMonitor>> queryEquipmentMonitorList(@RequestParam(name = "key", required = false) String key,
+ @RequestParam(name = "status", required = false) String status) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- List<MdcEquipmentMonitor> list = mdcEquipmentService.queryEquipmentMonitorList(userId, key);
+ List<MdcEquipmentMonitor> list = mdcEquipmentService.queryEquipmentMonitorList(userId, key, status);
return Result.OK(list);
}
--
Gitblit v1.9.3