Merge remote-tracking branch 'origin/master'

k94314517

2024-09-12 f02fde734aba50a4d5b5f89d88c075e6e93cb499

 .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*