From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/.gitignore |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/.gitignore b/server/.gitignore
index 5003e5f..c757e77 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -3,10 +3,11 @@
 *.iml
 log/
 #idea
-.idea
+.idea/
 *.iws
 *.iml
 *.ipr
+*.xml
 .mvn
 mvnw
 mvnw.cmd

--
Gitblit v1.9.3