From 687ed48ddc763e5674eb34b7f4e4227c30e2d384 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期六, 18 四月 2026 15:11:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

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

diff --git a/.gitignore b/.gitignore
index 29b8537..b820ba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 # Git worktrees (isolated workspaces)
 .worktrees/
 worktrees/
+.omc/
 
 # Nuget packages directory
 packages/  
@@ -439,3 +440,5 @@
 **/.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