From 4a13279fe13ad1cf6736670f6d1c5c61c8cba59b Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 12:41:11 +0800
Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0

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

diff --git a/.gitignore b/.gitignore
index 7dc579c..e608c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,11 @@
 ######################################################################
 # IDE
 .DS_Store
+/.DS_Store
+zhitan-admin/.DS_Store
+zhitan-admin/src/.DS_Store
+zhitan-system/.DS_Store
+zhitan-system/src/.DS_Store
 
 ### STS ###
 .apt_generated
@@ -47,4 +52,6 @@
 !*/build/*.html
 !*/build/*.xml
 
+*/.DS_Store
+
 uploadPath

--
Gitblit v1.9.3