From aabdaf234ddfe22b0a7d320775d2faf42141aaa5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 20 五月 2025 08:19:09 +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, 3 insertions(+), 1 deletions(-)
diff --git a/nglib/.idea/encodings.xml b/nglib/.idea/encodings.xml
index b858a91..b7072ea 100644
--- a/nglib/.idea/encodings.xml
+++ b/nglib/.idea/encodings.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="Encoding">
+ <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+ <file url="file://$PROJECT_DIR$/src/builder/HttpApi.java" charset="GBK" />
+ <file url="file://$PROJECT_DIR$/src/builder/HttpApi2.java" charset="GBK" />
<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" />
--
Gitblit v1.8.0