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

---
 .gitignore |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8343077..b820ba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 # Git worktrees (isolated workspaces)
 .worktrees/
 worktrees/
+.omc/
 
 # Nuget packages directory
 packages/  
@@ -426,3 +427,18 @@
 /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