From 1311774b7c71fe94016a7b2cdf508e3d39114422 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 四月 2024 09:46:06 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into wjc_new

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

diff --git a/.gitignore b/.gitignore
index 43124f4..fac7ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@
 
 
 local.properties
+.idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0