From 76c806e5ca84d7411b67ee3d6047cfc1454da8f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 04 八月 2024 23:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 313d8ad..09478a9 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -43,6 +43,4 @@
List<Map<String, Object>> treeDevice(String deviceName);
Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
-
- Object formulaCalculation(Map<String, Object> map, Boolean isAdopt);
}
--
Gitblit v1.9.3