Merge branch 'dev' into build

# Conflicts:
#	package.json
#	vue.config.js

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

@@ -62,11 +62,17 @@
                         <el-form-item label="接口是否单服务">
                           <el-checkbox v-model="form.isSingleService"/>
                         </el-form-item>
+                        <el-form-item label="是否启用水印">
+                          <el-checkbox v-model="form.waterMarker"/>
+                        </el-form-item>
                       </div>
                       <div class="fill">
                         <el-form-item label="默认首页">
                           <el-input v-model="form.homePage" clearable placeholder="填写应用的文件名"/>
                         </el-form-item>
+                        <el-form-item label="开启百度流量">
+                          <el-checkbox v-model="form.hmt"/>
+                        </el-form-item>
                       </div>
                     </el-row>
                   </template>