From 407ea8abef30f30608a0cd933f7f6c35e97095be Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 26 四月 2022 16:44:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 620b967..940439b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -115,13 +115,13 @@
return ResponseUtil.success(lightService.controlEnergySaving());
}
- /**
- * 鑾峰彇璁惧鐮�
- */
- @GetMapping("/deviceCode")
- public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
- return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
- }
+// /**
+// * 鑾峰彇璁惧鐮�
+// */
+// @GetMapping("/deviceCode")
+// public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
+// return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
+// }
/**
* 璁剧疆鍔熺巼
--
Gitblit v1.9.3