From 1dbcc9aaece95a75fc9720ef13e4d191ec3e0af6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 11 十一月 2025 09:39:28 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II

---
 .idea/workspace.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1aca4db..d14cc36 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="gmms" />
+    </artifacts-to-build>
+  </component>
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8fb06979-163e-47f4-9dfa-cdbddc7489f0" name="鏇存敼" comment="" />
+    <list default="true" id="8fb06979-163e-47f4-9dfa-cdbddc7489f0" name="鏇存敼" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nglib/src/builder/Manager.java" beforeDir="false" afterPath="$PROJECT_DIR$/nglib/src/builder/Manager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nglib/src/druidConnect/getMeterParatermeter.java" beforeDir="false" afterPath="$PROJECT_DIR$/nglib/src/druidConnect/getMeterParatermeter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nglib/src/toTcp/TcpClientHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/nglib/src/toTcp/TcpClientHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nglib/src/toTcp/TcpMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/nglib/src/toTcp/TcpMain.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/nglib/src/toTcp/TcpMultiServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/nglib/src/toTcp/TcpMultiServer.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -26,15 +38,23 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/workfile/Haier_MES_II&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/workfile/Haier_MES_II/gmms/WebContent/WEB-INF/lib&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;宸ヤ欢&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2850575&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\workfile\Haier_MES_II\gmms\WebContent\WEB-INF\lib" />
+    </key>
+  </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
@@ -53,6 +73,10 @@
       <updated>1741915288398</updated>
       <workItem from="1741915289710" duration="1265000" />
       <workItem from="1742172726815" duration="696000" />
+      <workItem from="1762752139391" duration="356000" />
+      <workItem from="1762752728233" duration="432000" />
+      <workItem from="1762753213495" duration="110000" />
+      <workItem from="1762754867922" duration="4983000" />
     </task>
     <servers />
   </component>

--
Gitblit v1.8.0