Squashed commit of the following:
commit c441ff2c35
Merge: ffa566e 3190c7a
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jun 27 19:22:51 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit ffa566e81c
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jun 27 19:22:45 2023 +0800
修改在库页面
commit 3190c7ab7a
Author: 0.0 <1092404103.qq.com>
Date: Tue Jun 27 18:09:13 2023 +0800
1.切换页面
commit c275c79f01
Merge: d9e70f7 3b8de83
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 18:11:29 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit d9e70f7198
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 18:11:24 2023 +0800
修改页面
commit 3b8de83a22
Merge: 258c1be c358676
Author: 0.0 <1092404103.qq.com>
Date: Mon Jun 26 16:35:37 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 258c1be197
Author: 0.0 <1092404103.qq.com>
Date: Mon Jun 26 16:35:23 2023 +0800
1.车辆司机关联
commit c358676783
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 15:55:32 2023 +0800
修改转库存品
commit 80cd366916
Merge: 57240c6 34e98c3
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 18:32:11 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 57240c68a8
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 18:32:04 2023 +0800
添加包件详情页面
# Conflicts:
# src/option/distribution/distributionStockArticleFrom.js
# src/views/distribution/inventory/delivery/distributionStockArticle.vue
# src/views/distribution/inventory/distributionStockArticleFrom.vue
|
马远东
qb
zhangsiyu
pref_mail@163.com
caoyizhong