From b1187e08e13a9bafc2742591f82ed9abc9c89935 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 09 五月 2025 13:21:27 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
nglib/.idea/encodings.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nglib/.idea/encodings.xml b/nglib/.idea/encodings.xml
index 83b0b33..b858a91 100644
--- a/nglib/.idea/encodings.xml
+++ b/nglib/.idea/encodings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
- <file url="file://$PROJECT_DIR$/bin/S7/S7control.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/builder/HttpHandlerDemo.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/src/builder/MachineManager.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/src/builder/Manager.java" charset="GBK" />
@@ -10,11 +9,12 @@
<file url="file://$PROJECT_DIR$/src/builder/ThreadHttpServer.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/src/ng/db/DBSession.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/ng/devices/InitUtil.java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/src/ng/devices/MysqlService.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/src/ng/devices/PlcBitInfo.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/ng/devices/PlcBitObject.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/ng/devices/PlcParameterInfo.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/ng/devices/PlcParameterObject.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/toTcp/TCPClient.java" charset="GBK" />
- <file url="PROJECT" charset="GBK" />
+ <file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.8.0