From 489682e2d163e104e621ce77a62925f6ce4e8a11 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 十月 2024 19:14:26 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan-test

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

diff --git a/.gitignore b/.gitignore
index ee31d72..ae69bc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea
+/hx-parent.iml

--
Gitblit v1.8.0