Merge refs/remotes/origin/master into refs/heads/master

闫增涛

2024-12-31 afdda50cc54231b4fa788041adadb49cc239da23

 .vscode/settings.json

@@ -8,7 +8,7 @@
  },
  "[javascript]": {
    "editor.formatOnSave": true,
    "editor.defaultFormatter": "vscode.typescript-language-features"
    "editor.defaultFormatter": "HookyQR.beautify"
  },
  "[json]": {
    "editor.defaultFormatter": "vscode.json-language-features"