From c9dcdd13e228f560f2123b2c9bf7386f33f1e688 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 20 四月 2026 22:51:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 .gitignore |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b069244..b820ba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
-# Build and Object Folders  
-bin/  
-obj/  
-  
-# Nuget packages directory  
+# Build and Object Folders
+bin/
+obj/
+
+# Git worktrees (isolated workspaces)
+.worktrees/
+worktrees/
+.omc/
+
+# Nuget packages directory
 packages/  
   
 ## Ignore Visual Studio temporary files, build results, and  
@@ -415,3 +420,25 @@
 /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
+/Code/娴嬭瘯宸ュ叿/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Server/Data
+/Code/娴嬭瘯宸ュ叿/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Server/Data

--
Gitblit v1.9.3