Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue

@@ -24,6 +24,9 @@
          <el-option label="分类查询" value="queryClassify"></el-option>
          <el-option label="含编码规则的分类查询" value="queryClassifyRule"></el-option>
          <el-option label="数据查询" value="queryData"></el-option>
          <el-option label="标准申请" value="applyCodeForBZ"></el-option>
          <el-option label="部门申请" value="syncDataForOrg"></el-option>
          <el-option label="人员申请" value="syncDataForPerson"></el-option>
        </el-select>
      </el-form-item>
<!--      集成任务 是否推送成功

 Source/UBCS-WEB/src/views/docking/loge.vue

@@ -103,20 +103,6 @@
            value:7
          },
          {
            label: '标准申请',
            prop: 'applyCodeForBZ',
            value:8          },
          {
            label: '部门申请',
            prop: 'syncDataForOrg',
            value:9
          },
          {
            label: '人员申请',
            prop: 'syncDataForPerson',
            value:10
          },
          {
            label:'接口参数',
            prop:'paramString',
            value:11