Merge remote-tracking branch 'origin/dev' into dev

vnobo · Oct 18, 2024 · e22050e · e22050e
2 parents 8ddd731 + 1d49818
commit e22050e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ng-web/.vscode/settings.json b/ng-web/.vscode/settings.json
@@ -34,6 +34,7 @@
     "**/${fileBasenameNoExtension}.{css,scss}",
     "node_modules/bootstrap/dist/css/bootstrap.css",
     "@angular/material/prebuilt-themes/azure-blue.css",
-    "node_modules/ng-zorro-antd/ng-zorro-antd.less",
-  ]
-}
+    "node_modules/ng-zorro-antd/ng-zorro-antd.less"
+  ],
+  "Codegeex.CommitMessage.LanguagePreference": "English"
+}