合并解决冲突

2025-05-15 19:44:48 +08:00
parent 329eea4e2f c288d36c63
commit 8f2ab53a65
988 changed files with 401 additions and 791004 deletions
--- a/AUTS_Win/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb
+++ b/AUTS_Win/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb
@@ -1,7 +0,0 @@
-' <autogenerated/>
-            Option Strict Off
-            Option Explicit On
-
-            Imports System
-            Imports System.Reflection
-            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName:=".NET Framework 4.8")>
--- a/AUTS_Win/obj/Debug/AUTS_Win-冲突-张虹_Win7.pdb
+++ b/AUTS_Win/obj/Debug/AUTS_Win-冲突-张虹_Win7.pdb
--- a/AUTS_Win/obj/Debug/AUTS_Win-冲突-方鹏洋_Win10.pdb
+++ b/AUTS_Win/obj/Debug/AUTS_Win-冲突-方鹏洋_Win10.pdb
--- a/AUTS_Win/obj/Debug/AUTS_Win.FrmMain-冲突-方鹏洋_Win10.resources
+++ b/AUTS_Win/obj/Debug/AUTS_Win.FrmMain-冲突-方鹏洋_Win10.resources
--- a/AUTS_Win/obj/Debug/AUTS_Win.FrmSettings.resources
+++ b/AUTS_Win/obj/Debug/AUTS_Win.FrmSettings.resources
--- a/AUTS_Win/obj/Debug/AUTS_Win.Resources.resources
+++ b/AUTS_Win/obj/Debug/AUTS_Win.Resources.resources
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-张树友_Win10.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-张树友_Win10.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-张虹_Win7.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-张虹_Win7.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-方鹏洋_Win10.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference-冲突-方鹏洋_Win10.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CopyComplete
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.CopyComplete
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute-冲突-Momo_Win7.txt
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.FileListAbsolute-冲突-Momo_Win7.txt
@@ -1,95 +0,0 @@
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\FlexCell.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\SharpCompress.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Data.SQLite.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Zstandard.Net.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Text.Encoding.CodePages.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Text.Encoding.CodePages.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.vbproj.AssemblyReference.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.vbproj.GenerateResource.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.vbproj.CoreCompileInputs.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.vbproj.CopyComplete
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.FrmMain.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.Resources.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\AUTS_Win.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\AUTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\AUTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\AUTS_Win.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\AUTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\AUTS_Win.exe.config
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\AUTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\AUTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\FlexCell.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\MySql.Data.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\SharpCompress.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Newtonsoft.Json.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Data.SQLite.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Google.Protobuf.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Zstandard.Net.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Memory.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Buffers.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Text.Encoding.CodePages.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Numerics.Vectors.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\UTS_Core.dll.config
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\MySql.Data.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Newtonsoft.Json.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Google.Protobuf.pdb
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\Google.Protobuf.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Memory.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Buffers.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Text.Encoding.CodePages.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Compression.LZ4.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\K4os.Hash.xxHash.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\System.Numerics.Vectors.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.FrmMain.resources
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.Resources.resources
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.vbproj.GenerateResource.cache
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.vbproj.CoreCompileInputs.cache
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.vbproj.CopyComplete
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.FrmSettings.resources
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\FluentFTP.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\FluentFTP.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\TeeChart.dll
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\bin\Debug\TeeChart.xml
-E:\Sync\UTS\SW\UTS_Studio\AUTS_Win\obj\Debug\AUTS_Win.vbprojAssemblyReference.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource-冲突-Momo_Win7.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource-冲突-Momo_Win7.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource-冲突-方鹏洋_Win10.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.GenerateResource-冲突-方鹏洋_Win10.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.Up2Date
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.Up2Date
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_BLV_MOMO_十一月-14-161135-2022_Conflict.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_BLV_MOMO_十一月-14-161135-2022_Conflict.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_BLV_MOMO_十二月-04-005407-2022_Conflict.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_BLV_MOMO_十二月-04-005407-2022_Conflict.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_DESKTOP-19R1DIU_7月-18-212246-2023_Conflict.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_DESKTOP-19R1DIU_7月-18-212246-2023_Conflict.cache
--- a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_DESKTOP-K00DB7A_10月-26-172128-2022_Conflict.cache
+++ b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference_DESKTOP-K00DB7A_10月-26-172128-2022_Conflict.cache
--- a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences-冲突-张树友_Win10.cache
+++ b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences-冲突-张树友_Win10.cache
--- a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences-冲突-张虹_Win7.cache
+++ b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences-冲突-张虹_Win7.cache
--- a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences.cache
--- a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput-冲突-张虹_Win7.cache
+++ b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferencesInput-冲突-张虹_Win7.cache
--- a/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences_PC-20220312WOOV_9月-29-093037-2022_Conflict.cache
+++ b/AUTS_Win/obj/Debug/DesignTimeResolveAssemblyReferences_PC-20220312WOOV_9月-29-093037-2022_Conflict.cache
--- a/Project.Resources.Designer.vb.dll
+++ b/Project.Resources.Designer.vb.dll
--- a/AUTS_Win/obj/Debug/UTS_Win.exe.config
+++ b/AUTS_Win/obj/Debug/UTS_Win.exe.config
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="UTS_Win.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-  </startup>
-  <userSettings>
-    <UTS_Win.My.MySettings>
-      <setting name="LastProjectName" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="LastProcessStationName" serializeAs="String">
-        <value />
-      </setting>
-    </UTS_Win.My.MySettings>
-  </userSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/AUTS_Win/obj/Debug/UTS_Win.vbproj.AssemblyReference.cache
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbproj.AssemblyReference.cache
--- a/AUTS_Win/obj/Debug/UTS_Win.vbproj.CopyComplete
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbproj.CopyComplete
--- a/AUTS_Win/obj/Debug/UTS_Win.vbproj.CoreCompileInputs.cache
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbproj.CoreCompileInputs.cache
@@ -1 +0,0 @@
-cb966f01d0266d7d6579734948db84d99fa89fb1
--- a/AUTS_Win/obj/Debug/UTS_Win.vbproj.FileListAbsolute.txt
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbproj.FileListAbsolute.txt
@@ -1,191 +0,0 @@
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe.config
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Data.SQLite.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbprojAssemblyReference.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.Resources.resources
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.GenerateResource.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CoreCompileInputs.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CopyComplete
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll.config
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.FrmMain.resources
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\FlexCell.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\SharpCompress.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Win.exe.config
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Win.exe
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Win.pdb
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Win.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\MySql.Data.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Core.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\SharpCompress.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\log4net.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Data.SQLite.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\FlexCell.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Memory.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Buffers.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Core.pdb
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Core.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\UTS_Core.dll.config
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Memory.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Buffers.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.vbprojAssemblyReference.cache
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.FrmMain.resources
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.Resources.resources
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.vbproj.GenerateResource.cache
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.vbproj.CoreCompileInputs.cache
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.vbproj.CopyComplete
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.exe
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.xml
-F:\ML\Application\Tencent\WeChat\MLCache\WeChat Files\wxid_tdgxevyu61xr22\FileStorage\File\2020-11\UTS_Studio-1161434\UTS_Win\obj\Debug\UTS_Win.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Zstandard.Net.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Renci.SshNet.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe.config
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.pdb
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\SharpCompress.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\log4net.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Data.SQLite.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\FlexCell.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Zstandard.Net.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Renci.SshNet.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.pdb
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll.config
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbprojAssemblyReference.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.FrmMain.resources
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.Resources.resources
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.GenerateResource.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CoreCompileInputs.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CopyComplete
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.pdb
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe.config
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.pdb
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.xml
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\SharpCompress.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Data.SQLite.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\FlexCell.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\Zstandard.Net.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\Renci.SshNet.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Memory.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.pdb
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.xml
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll.config
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Memory.xml
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.xml
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbprojAssemblyReference.cache
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.FrmMain.resources
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.Resources.resources
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.GenerateResource.cache
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CoreCompileInputs.cache
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CopyComplete
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.xml
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.pdb
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.dll
-F:\ML\Project\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.xml
-F:\ML\Project\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe.config
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\SharpCompress.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\FlexCell.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Newtonsoft.Json.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Data.SQLite.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Google.Protobuf.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Zstandard.Net.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.Streams.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\BouncyCastle.Crypto.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Ubiety.Dns.Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\Renci.SshNet.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Compression.LZ4.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\K4os.Hash.xxHash.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.AssemblyReference.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.FrmMain.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.Resources.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.GenerateResource.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CoreCompileInputs.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Win.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\UTS_Core.dll.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\MySql.Data.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Memory.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Buffers.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Numerics.Vectors.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.vbproj.CopyComplete
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\obj\Debug\UTS_Win.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\TeeChart.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Win\bin\Debug\TeeChart.xml
--- a/AUTS_Win/obj/Debug/UTS_Win.vbproj.GenerateResource.cache
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbproj.GenerateResource.cache
--- a/AUTS_Win/obj/Debug/UTS_Win.vbprojAssemblyReference.cache
+++ b/AUTS_Win/obj/Debug/UTS_Win.vbprojAssemblyReference.cache