Merge remote-tracking branch 'github/dev' into addFeature

wu_xinjun

2022-03-24 5a4485945ba7b09f9513d9e31b60c58b5a1f61b7

 .vscode/settings.json

@@ -1,21 +1,12 @@
{
    "protoc": {
        // "path": "D:/anaconda3/Library/bin/protoc.exe",
        "path": "C:/Users/zhaoyipeng/miniconda3/envs/py39/Library/bin/protoc.exe",
        "compile_on_save": true,
        "options": [
            "--proto_path=${workspaceRoot}/proto",
            "--python_out=${workspaceRoot}/src/protos"
        ]
    },
    
    "python.poetryPath": "${workspaceFolder}/env/aerial_deploy/python.exe",
    "python.poetryPath": "${workspaceFolder}/.env/python.exe",
    "jupyter.kernels.filter": [
        {
            "type": "jupyterKernelspec",
            "path": "${workspaceFolder}/env/aerial_deploy/python.exe"
            "path": "${workspaceFolder}/.env/python.exe"
        }
    ],
    "python.envFile": "${workspaceFolder}/env/aerial_deploy",
    "python.defaultInterpreterPath": "${workspaceFolder}/env/aerial_deploy/python.exe"
    "python.envFile": "${workspaceFolder}/.env",
    "python.defaultInterpreterPath": "${workspaceFolder}/.env/python.exe"
}