From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .gitignore |   70 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1c2a23..e608c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,57 @@
-# Compiled class file
-*.class
+######################################################################
+# Build Tools
 
-# Log file
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+.DS_Store
+/.DS_Store
+zhitan-admin/.DS_Store
+zhitan-admin/src/.DS_Store
+zhitan-system/.DS_Store
+zhitan-system/src/.DS_Store
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
 *.log
+*.xml.versionsBackup
+*.swp
 
-# BlueJ files
-*.ctxt
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+*/.DS_Store
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+uploadPath

--
Gitblit v1.9.3