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

wu

2023-12-20 5af1f5cf615811334009eaf39dc7eb9e30ad96e0

 .vscode/settings.json

@@ -1,3 +1,4 @@
{
    "java.configuration.updateBuildConfiguration": "interactive"
    "java.configuration.updateBuildConfiguration": "interactive",
    "java.debug.settings.onBuildFailureProceed": true
}