From 4606665e0e359aa54483283c042934c644a45434 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期一, 28 四月 2025 17:26:15 +0800
Subject: [PATCH] 修改冲突问题

---
 .gitignore |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0d162e..1d08bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,7 +141,6 @@
 # AxoCover is a Code Coverage Tool
 .axoCover/*
 !.axoCover/settings.json
-
 # Coverlet is a free, cross platform Code Coverage Tool
 coverage*.json
 coverage*.xml
@@ -200,6 +199,8 @@
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
 !**/[Pp]ackages/build/
+!**/system/log/
+!**/api/log/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files
@@ -361,4 +362,11 @@
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
+/Web/public/config.js
+/agv浠诲姟涓庢ā鐗�(11鏈�26鏃ユ洿鏂�)(1).xls
+/IP鍒嗛厤.xlsx
+/JC30鎵樼洏绾夸氦浜掕〃(1).xlsx
+/鍘傚唴鐗╂祦璋冨害鎺у埗绯荤粺RCS-2000 V3.2 瀵瑰浠诲姟鎺ュ彛鏂囨。.pdf
+/绌挎鏉垮崗璁甐1.4.xlsx
 /WCS.Application/Configuration/Database.json
+/.gitignore

--
Gitblit v1.8.0