diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 64168eb8..8bc77185 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -116,6 +116,9 @@
 <!--          <el-form-item label="服务类型" prop="serveType">-->
 <!--            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
 <!--          </el-form-item>-->
+<!--          <el-form-item label="服务类型" prop="serveType">-->
+<!--            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
+<!--          </el-form-item>-->
 <!--          <el-form-item label="配送仓库" prop="distributingWarehouse">-->
 <!--            <el-input v-model="form.distributingWarehouse" placeholder="请输入配送仓库"/>-->
 <!--          </el-form-item>-->
diff --git a/vite.config.js b/vite.config.js
index a40af650..69cf894c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,11 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
+<<<<<<< HEAD
           target: 'http://192.168.2.11:8889',
+=======
+          target: 'http://192.168.2.29:13000',
+>>>>>>> 859932a264850d576194e4a85decdd2c542ee4fb
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),