From 1402b12c5238a979364eac9d30ed1f25fbc14a49 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期日, 04 一月 2026 19:15:48 +0800
Subject: [PATCH] Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao

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

diff --git a/.gitignore b/.gitignore
index 4916f7a..b60b03f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
 *.iml
 *.ipr
 
+### JRebel ###
+rebel.xml
 ### NetBeans ###
 nbproject/private/
 build/*
@@ -37,6 +39,7 @@
 # Others
 *.log
 *.xml.versionsBackup
+*.swp
 
 !*/build/*.java
 !*/build/*.html

--
Gitblit v1.9.3