From 466c70dccc2b46ffa62fd14c8b2f88349c5ef9c6 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 二月 2025 22:58:28 +0800
Subject: [PATCH] Merge branch 'master' into develop1.0

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

diff --git a/.gitignore b/.gitignore
index 8431ded..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

--
Gitblit v1.9.3