Haier_MES_II.git

			@@ -11,11 +11,8 @@
			<component name="ChangeListManager">
			<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" />
			<change beforePath="$PROJECT_DIR$/gmms/WebContent/login/quanxian.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/gmms/WebContent/login/quanxian.jsp" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/gmms/WebContent/mysqlInsert/mysql_connect.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/gmms/WebContent/mysqlInsert/mysql_connect.jsp" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -76,7 +73,9 @@
			<workItem from="1762752139391" duration="356000" />
			<workItem from="1762752728233" duration="432000" />
			<workItem from="1762753213495" duration="110000" />
			<workItem from="1762754867922" duration="4983000" />
			<workItem from="1762754867922" duration="7046000" />
			<workItem from="1763344823060" duration="24000" />
			<workItem from="1763345140317" duration="459000" />
			</task>
			<servers />
			</component>