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

chenyabin

2021-04-20 d8754e34007e7a36a01d4e2dcc79ff58418a666a

 src/components/BaseNav/pipeline/AffiliatedFacilities.vue

@@ -3,7 +3,7 @@
    <div class="affiliatedFacilities">
        <el-dialog
                custom-class="affiliatedFacilities-dialog"
                :title="facilitiesParameter.properties.pipename"
                :title="facilitiesParameter && facilitiesParameter.properties.pipename"
                :visible.sync="dialogVisible"
                :append-to-body="true"
                :modal="false"