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

闫增涛

2024-03-21 bc7b375c7dd6b256ebd582c4ab85f77fca8dc054

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