From 79e5f89924577aee65b6127e0d7966ffb0e5fdc4 Mon Sep 17 00:00:00 2001
From: zhang <z1415143022@163.com>
Date: 星期五, 18 四月 2025 15:04:29 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_form_develop1.0

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

diff --git a/.gitignore b/.gitignore
index 648d3e4..e608c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,6 @@
 !*/build/*.html
 !*/build/*.xml
 
+*/.DS_Store
+
 uploadPath

--
Gitblit v1.9.3