Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-22 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

 .gitignore

@@ -4,7 +4,7 @@
.gradle

/build/

!gradle/wrapper/gradle-wrapper.jar



claude.md

target/

!.mvn/wrapper/maven-wrapper.jar



@@ -25,6 +25,8 @@
*.iml

*.ipr



### JRebel ###

rebel.xml

### NetBeans ###

nbproject/private/

build/*

@@ -37,7 +39,8 @@
# Others

*.log

*.xml.versionsBackup

*.swp



!*/build/*.java

!*/build/*.html

!*/build/*.xml
!*/build/*.xml