From 47f972e0f6a90e83594b581f15f4ce8902504856 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Fri, 16 Jun 2023 17:00:39 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 859932a264850d576194e4a85decdd2c542ee4fb
Author: kilo <wan.ren@foxmail.com>
Date:   Fri Jun 16 11:18:14 2023 +0800

    配送api调整

commit 8f849258241bef3bc65275eb8c6c72f084b0d42d
Author: kilo <wan.ren@foxmail.com>
Date:   Fri Jun 16 11:15:28 2023 +0800

    配送api调整

commit bb3434c07a54363a55b1f808554d59a35dff51f2
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Jun 16 10:56:59 2023 +0800

    添加班组

commit e59ea0d301e70c20aa15eb800c66417e57462d47
Merge: ffbd2d0 ccb3fd8
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Jun 16 09:16:03 2023 +0800

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

commit ffbd2d028f29d5f7dbd2140d235aaa9f3c3a9098
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Jun 16 09:15:54 2023 +0800

    修改备货查询

commit ccb3fd8ad5b5a459ea3188b3f3e417e3668d1290
Author: 0.0 <1092404103.qq.com>
Date:   Thu Jun 15 20:27:23 2023 +0800

    1.调整搜索时间

commit 9ef429246e8b9e9c7d5da01edd441a92bdcd34ab
Author: kilo <wan.ren@foxmail.com>
Date:   Thu Jun 15 19:38:33 2023 +0800

    仓库所属部门调整

commit 3d2b759b4ec9fe56205094050addedf626bd9533
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Jun 15 16:23:00 2023 +0800

    修改备货

commit c58aa3a26bc61fae9808270b1763a815d5be6549
Author: kilo <wan.ren@foxmail.com>
Date:   Thu Jun 15 15:01:55 2023 +0800

    备货、预约页面

commit 0aa1c28db68dc5233143a3efe27b20db3a86336b
Merge: ca423ac 72e0847
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Jun 15 10:30:15 2023 +0800

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

commit ca423ac6e649b61a4febd224fd61d3f7103c6d46
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Jun 15 10:30:09 2023 +0800

    添加库存品页面

# Conflicts:
#	src/views/distribution/signfor/distributionSignfor.vue
#	vite.config.js
---
 src/views/distribution/signfor/distributionSignfor.vue | 3 +++
 vite.config.js                                         | 4 ++++
 2 files changed, 7 insertions(+)

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/, ''),