Merge remote-tracking branch 'origin/master'

jiangping

2024-12-18 4b8fda000f9f600ba5187e738278b340b55ebd7c

 .gitignore

@@ -17,6 +17,6 @@
/logs
*.log
*.zip

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