Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

maven

3 天以前 fe2d7c404c69700404814e18a70d5e606916486b

 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);