Squashed commit of the following:

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

    配送api调整

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

    配送api调整

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

    添加班组

commit e59ea0d301
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 ffbd2d028f
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Jun 16 09:15:54 2023 +0800

    修改备货查询

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

    1.调整搜索时间

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

    仓库所属部门调整

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

    修改备货

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

    备货、预约页面

commit 0aa1c28db6
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 ca423ac6e6
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

@@ -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>-->

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