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

闫增涛

2024-03-22 88d80c9f40935c6ce7ea51683c6cdc1a80d1997b

 .vscode/settings.json

@@ -32,7 +32,7 @@
  },
  "editor.tabSize": 2,
  "[wxml]": {
    "editor.defaultFormatter": "esbenp.prettier-vscode"
    "editor.defaultFormatter": "wechat.miniprogram.wxml-language-features"
  },
  "[css]": {
    "editor.defaultFormatter": "HookyQR.beautify"