From 182cc3a5c47f9bc0445fcb755a92aa714b780da2 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 30 三月 2026 15:23:01 +0800
Subject: [PATCH] 合并远程分支1
---
LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfo.cs | 2
LB_SmartVision/.vs/LB_SmartVision/DesignTimeBuild/.dtbcache.v2 | 0
LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.strings.v9.bin | 0
LB_SmartVision/.vs/LB_SmartVision/v17/.futdcache.v2 | 0
LB_SmartVision/.vs/LB_SmartVision/v17/fileList.bin | 0
LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfoInputs.cache | 2
LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.json | 37 ++++++++++++++++++
LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfo.cs | 2
LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.backup.json | 41 ++++++++++++++++++++
LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.metadata.v9.bin | 0
LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.projects.v9.bin | 0
LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfoInputs.cache | 2
LB_SmartVision/.vs/LB_SmartVision/v17/.suo | 0
13 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/LB_SmartVision/.vs/LB_SmartVision/DesignTimeBuild/.dtbcache.v2 b/LB_SmartVision/.vs/LB_SmartVision/DesignTimeBuild/.dtbcache.v2
new file mode 100644
index 0000000..8dd6a27
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/LB_SmartVision/.vs/LB_SmartVision/v17/.futdcache.v2 b/LB_SmartVision/.vs/LB_SmartVision/v17/.futdcache.v2
new file mode 100644
index 0000000..f44c5db
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/v17/.futdcache.v2
Binary files differ
diff --git a/LB_SmartVision/.vs/LB_SmartVision/v17/.suo b/LB_SmartVision/.vs/LB_SmartVision/v17/.suo
new file mode 100644
index 0000000..913a080
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/v17/.suo
Binary files differ
diff --git a/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.backup.json b/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.backup.json
new file mode 100644
index 0000000..d0f36a2
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.backup.json
@@ -0,0 +1,41 @@
+{
+ "Version": 1,
+ "WorkspaceRootPath": "D:\\\u9879\u76EE\\\u8F6E\u80CE\u5916\u89C2\u68C0\u6D4B\\SmartVision\\LB_SmartVision\\",
+ "Documents": [],
+ "DocumentGroupContainers": [
+ {
+ "Orientation": 0,
+ "VerticalTabListWidth": 256,
+ "DocumentGroups": [
+ {
+ "DockedWidth": 610,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
+ }
+ ]
+ },
+ {
+ "DockedWidth": 610,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.json b/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.json
new file mode 100644
index 0000000..98c3c23
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/v17/DocumentLayout.json
@@ -0,0 +1,37 @@
+{
+ "Version": 1,
+ "WorkspaceRootPath": "D:\\\u9879\u76EE\\\u8F6E\u80CE\u5916\u89C2\u68C0\u6D4B\\SmartVision\\LB_SmartVision\\",
+ "Documents": [],
+ "DocumentGroupContainers": [
+ {
+ "Orientation": 0,
+ "VerticalTabListWidth": 256,
+ "DocumentGroups": [
+ {
+ "DockedWidth": 610,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
+ }
+ ]
+ },
+ {
+ "DockedWidth": 610,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/LB_SmartVision/.vs/LB_SmartVision/v17/fileList.bin b/LB_SmartVision/.vs/LB_SmartVision/v17/fileList.bin
new file mode 100644
index 0000000..47a12bf
--- /dev/null
+++ b/LB_SmartVision/.vs/LB_SmartVision/v17/fileList.bin
Binary files differ
diff --git a/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.metadata.v9.bin b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.metadata.v9.bin
new file mode 100644
index 0000000..ce5c56b
--- /dev/null
+++ b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.metadata.v9.bin
Binary files differ
diff --git a/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.projects.v9.bin b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.projects.v9.bin
new file mode 100644
index 0000000..a058041
--- /dev/null
+++ b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.projects.v9.bin
Binary files differ
diff --git a/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.strings.v9.bin b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.strings.v9.bin
new file mode 100644
index 0000000..5efeb15
--- /dev/null
+++ b/LB_SmartVision/.vs/ProjectEvaluation/lb_smartvision.strings.v9.bin
Binary files differ
diff --git a/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfo.cs b/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfo.cs
index 7bba6f6..02b3bbf 100644
--- a/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfo.cs
+++ b/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("LB_SmartVision")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+06c627ec032b3f3876fd7db8a3ff0ff1a6614fa2")]
[assembly: System.Reflection.AssemblyProductAttribute("LB_SmartVision")]
[assembly: System.Reflection.AssemblyTitleAttribute("LB_SmartVision")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfoInputs.cache b/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfoInputs.cache
index 92c0b1f..402c70c 100644
--- a/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfoInputs.cache
+++ b/LB_SmartVision/obj/Debug/net8.0-windows/LB_SmartVision.AssemblyInfoInputs.cache
@@ -1 +1 @@
-8f2605af657019903fb0ae46a9c30a6bb2d0523769e5897edbefead2c20d7ae3
+4bcdd4e1c3906e92d4a272b16c81a12273ebcc1198e0616cc820ccc5f99bcca8
diff --git a/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfo.cs b/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfo.cs
index 1b67c8a..c9e28ea 100644
--- a/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfo.cs
+++ b/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("LB_VisionProcesses")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+06c627ec032b3f3876fd7db8a3ff0ff1a6614fa2")]
[assembly: System.Reflection.AssemblyProductAttribute("LB_VisionProcesses")]
[assembly: System.Reflection.AssemblyTitleAttribute("LB_VisionProcesses")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfoInputs.cache b/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfoInputs.cache
index f01a6ba..cd4f99a 100644
--- a/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfoInputs.cache
+++ b/LB_VisionProcesses/obj/Debug/net8.0-windows7.0/LB_VisionProcesses.AssemblyInfoInputs.cache
@@ -1 +1 @@
-00c40c9d8d0a350d5c8fedd19ade55a65552e0cf84d7cd537fa87f27ae291172
+3d1b62b72ad8bc98b0aea4495e0951b590bfb65671eb4d6b2bc6d163a320f657
--
Gitblit v1.9.3