Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

clll

2023-11-27 1de312a18d164c2fa3718a1a975b8c5804723bcf

 .vscode/settings.json

@@ -1,3 +1,3 @@
{
  "java.configuration.updateBuildConfiguration": "interactive"
    "java.configuration.updateBuildConfiguration": "interactive"
}