From 94a1a7574f7ce3c61148742cb6f8e6c60a4ed3aa Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期一, 28 四月 2025 17:19:53 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/.gitignore b/.gitignore
index e8390d7..1d08bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -368,3 +368,5 @@
 /JC30鎵樼洏绾夸氦浜掕〃(1).xlsx
 /鍘傚唴鐗╂祦璋冨害鎺у埗绯荤粺RCS-2000 V3.2 瀵瑰浠诲姟鎺ュ彛鏂囨。.pdf
 /绌挎鏉垮崗璁甐1.4.xlsx
+/WCS.Application/Configuration/Database.json
+/.gitignore

--
Gitblit v1.8.0