Merge branch 'dev' into build

# Conflicts:
#	project/oms/apps/develop/AppDeployCustom/add.vue

project/oms/apps/develop/AppDeployCustom/add.vue

@@ -77,9 +77,18 @@
                     </el-row>
                   </template>
                   <template v-else-if="form.type=='web'">
-                    <el-form-item label="接口是否单服务">
-                      <el-checkbox v-model="form.isSingleService"/>
-                    </el-form-item>
+                    <el-row type="flex">
+                      <div class="fill">
+                        <el-form-item label="接口是否单服务">
+                          <el-checkbox v-model="form.isSingleService"/>
+                        </el-form-item>
+                      </div>
+                      <div class="fill">
+                        <el-form-item label="开启百度流量">
+                          <el-checkbox v-model="form.hmt"/>
+                        </el-form-item>
+                      </div>
+                    </el-row>
                   </template>
                 </template>
               </ai-card>