Squashed commit of the following:
commit bb7cdb8d1e
Merge: fab70c4 cbb2a85
Author: big-y <804609860@qq.com>
Date: Fri Aug 11 09:35:00 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/distribution/inventory/distributionStockArticleDetails.vue
commit cbb2a855b0
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 22:14:50 2023 +0800
修改订单详细字段
commit 7b99fabb02
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 21:36:15 2023 +0800
修改订单查询条件
commit 3d9a02978d
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 20:41:59 2023 +0800
修改客户信息编辑编码校验
commit d8aa2f2c1d
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 19:39:39 2023 +0800
修改客户服务仓添加
commit fab70c4b27
Author: big-y <804609860@qq.com>
Date: Thu Aug 10 19:11:23 2023 +0800
标签渲染
commit ae4f831595
Author: big-y <804609860@qq.com>
Date: Thu Aug 10 18:49:31 2023 +0800
标签渲染
commit 9cca1d753a
Merge: 9aa102a b2e7078
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 17:30:00 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 9aa102af6d
Author: caoyizhong <1270296080@qq.com>
Date: Thu Aug 10 17:29:35 2023 +0800
修改班组添加操作
commit 5cbd767207
Author: big-y <804609860@qq.com>
Date: Thu Aug 10 16:19:29 2023 +0800
标签渲染
commit b2e7078fbe
Merge: 553e8d3 37356e4
Author: pref_mail@163.com <123456>
Date: Thu Aug 10 14:33:28 2023 +0800
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
commit 553e8d3c4e
Author: pref_mail@163.com <123456>
Date: Thu Aug 10 14:32:55 2023 +0800
没有修改二维码包间生成
commit 37356e4d77
Author: 0.0 <1092404103.qq.com>
Date: Thu Aug 10 09:08:11 2023 +0800
1.隐藏按钮
commit 1272b45ea7
Author: kilo <wan.ren@foxmail.com>
Date: Wed Aug 9 21:56:21 2023 +0800
订单新增调整
commit e3c6e255ff
Author: 0.0 <1092404103.qq.com>
Date: Wed Aug 9 21:40:34 2023 +0800
1.物料导出导入,托盘报损
commit b598c70542
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 9 21:02:55 2023 +0800
修改批量补充物料
commit 47ab085072
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 9 15:56:56 2023 +0800
添加订单字段
commit 921ea4ffd0
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 9 14:02:16 2023 +0800
添加三方物料
commit d78b8a9da4
Merge: 1b1efea 454ce4c
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 9 11:30:36 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 1b1efea6a5
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 9 11:30:31 2023 +0800
修改文字提醒
|
caoyizhong
zhangsiyu
pref_mail@163.com