Merge remote-tracking branch 'origin/master'

k94314517

2024-05-27 392f7a3134cb7a27a555bb1b3e2f3601c5eadde1

 .gitignore

@@ -14,6 +14,9 @@
*.war
*.ear
*.iml

/logs
*.log
*.zip
h5/unpackage/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*