From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index 5f073e0..e608c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,12 @@
 
 ######################################################################
 # 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
@@ -46,4 +52,6 @@
 !*/build/*.html
 !*/build/*.xml
 
+*/.DS_Store
+
 uploadPath

--
Gitblit v1.9.3