From 18aad0f6f20ce89e2e904a59952f72c194ce085b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 25 四月 2025 13:42:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/featrue/1.2.0-hxb' into 1.2.0

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

diff --git a/.gitignore b/.gitignore
index fac7ee0..eceeb1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 .idea/workspace.xml
 .idea/
 *.properties
+local.properties

--
Gitblit v1.8.0