From 6fb742d463ecac5e7d4934d7248a40979edc3626 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 21 七月 2025 14:33:25 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns
---
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 9d740d3..98c1942 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -136,8 +136,8 @@
}
break;
case ".db":
- map = analysisDb1(data, userMap, device);
-// map = analysisDb(data, userMap, device);
+// map = analysisDb1(data, userMap, device);
+ map = analysisDb(data, userMap, device);
break;
case ".png":
map = readPngString(data, userMap, device);
--
Gitblit v1.9.3