From a00fcf19e692c458283015c201a0e743dd3d5ec6 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 29 五月 2025 15:47:52 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiXinLaiRui/LunDuiYa

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

diff --git a/.gitignore b/.gitignore
index 4ae279e..d3d1439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 
 *.cache
 *.dll
-*.json
 *.user
 /椤圭洰浠ｇ爜/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.FileListAbsolute.txt
 *.props
@@ -28,3 +27,8 @@
 *.xlsx
 *.vsidx
 /椤圭洰浠ｇ爜/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
+/椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
+*.apk
+/椤圭洰浠ｇ爜/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj
+*.json
+/椤圭洰浠ｇ爜/PDA/LDY_PDA.zip

--
Gitblit v1.9.3