From 61a7d9eb8c0bb672fdd3a0da2b7f48dc8cfef389 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 31 三月 2026 10:48:39 +0800
Subject: [PATCH] Merge branch 'zheng'

---
 .gitignore |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f351a2..29b8537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
-# Build and Object Folders  
-bin/  
-obj/  
-  
-# Nuget packages directory  
+# Build and Object Folders
+bin/
+obj/
+
+# Git worktrees (isolated workspaces)
+.worktrees/
+worktrees/
+
+# Nuget packages directory
 packages/  
   
 ## Ignore Visual Studio temporary files, build results, and  
@@ -405,3 +409,33 @@
 /Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/copilot-chat
 /Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices
 /Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices
+/Code/WCS/WIDESEAWCS_Server/.vs
+/Code/WCS/WIDESEAWCS_Server/.vs
+*.db
+Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/18.0.988.22099/CodeChunks.db
+Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/18.0.988.22099/SemanticSymbols.db
+/Code/WMS/WIDESEA_WMSServer/.vs/CopilotSnapshots
+/Code/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/copilot-chat
+/Code/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v18
+/Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices
+/Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/18.0.988.22099
+/Code/WCS/WIDESEAWCS_S7Simulator/tmp_extract3_PlcLink
+/Code/WCS/WIDESEAWCS_S7Simulator/tmp_extract3_proto2
+/Code/WCS/WIDESEAWCS_S7Simulator/tmp_extract_line_doc
+/Code/WCS/WIDESEAWCS_S7Simulator/tmp_extract_PlcLink_鍫嗗灈鏈洪」鐩�
+/Code/WCS/WIDESEAWCS_S7Simulator/tmp_extract_鍫嗗灈鏈轰笌涓婁綅鏈轰氦浜掍俊鎭�
+/Code/WCS/WIDESEAWCS_S7Simulator/.vs/WIDESEAWCS_S7Simulator.slnx/v18/DocumentLayout.backup.json
+/Code/WCS/WIDESEAWCS_S7Simulator/.vs/WIDESEAWCS_S7Simulator.slnx/v18/DocumentLayout.json
+/.omc
+/Code/WMS/WIDESEA_WMSServer/.omc
+/Code/WMS/WIDESEA_WMSServer/.vs
+/.omc
+/Code/WCS/WIDESEAWCS_Server/.vs
+Code/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v18/DocumentLayout.json
+Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
+/Code/WMS/WIDESEA_WMSClient/.omc
+
+# Local IDE and assistant environment files
+**/.claude/settings.local.json
+**/.vs/**/DocumentLayout.json
+**/.vs/**/DocumentLayout.backup.json

--
Gitblit v1.9.3