合并解决冲突

2025-05-15 19:44:48 +08:00
parent 329eea4e2f c288d36c63
commit 8f2ab53a65
988 changed files with 401 additions and 791004 deletions
--- a/UTS_Core/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb
+++ b/UTS_Core/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/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache
--- a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences_BLV_MOMO_一月-03-162956-2024_Conflict.cache
+++ b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences_BLV_MOMO_一月-03-162956-2024_Conflict.cache
--- a/Project.Application.Designer.vb.dll
+++ b/Project.Application.Designer.vb.dll
--- a/Project.Resources.Designer.vb.dll
+++ b/Project.Resources.Designer.vb.dll
--- a/UTS_Core/obj/Debug/UTS_Core.Resources.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.Resources.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Login.LoginForm.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Login.LoginForm.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.DlgCreateProject.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.DlgCreateProject.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.DlgLoadProject.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.DlgLoadProject.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Project.FrmProject.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.DlgLoadStation.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.DlgLoadStation.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.DlgStationPlanStyle.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.DlgStationPlanStyle.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationDesign.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Station.FrmStationPlan.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.UtsInputBox.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.UtsInputBox.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.UtsMsgBox.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.UtsMsgBox.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.utsLabel.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.Controls.utsLabel.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.FrmStationTest.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UTSModule.Test.FrmStationTest.resources
--- a/UTS_Core/obj/Debug/UTS_Core.UserControl1.resources
+++ b/UTS_Core/obj/Debug/UTS_Core.UserControl1.resources
--- a/UTS_Core/obj/Debug/UTS_Core.vbproj.CopyComplete
+++ b/UTS_Core/obj/Debug/UTS_Core.vbproj.CopyComplete
--- a/UTS_Core/obj/Debug/UTS_Core.vbproj.Up2Date
+++ b/UTS_Core/obj/Debug/UTS_Core.vbproj.Up2Date
--- a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache
+++ b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference.cache
--- a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference_BLV_MOMO_一月-03-163529-2024_Conflict.cache
+++ b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference_BLV_MOMO_一月-03-163529-2024_Conflict.cache
--- a/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference_BLV_MOMO_十二月-23-044026-2023_Conflict.cache
+++ b/UTS_Core/obj/Debug/UTS_Core.vbprojAssemblyReference_BLV_MOMO_十二月-23-044026-2023_Conflict.cache
--- a/UTS_Core/obj/Debug/UTS_Core.xml
+++ b/UTS_Core/obj/Debug/UTS_Core.xml