Commit Graph

1247 Commits

Author SHA1 Message Date
18338781771 750c2fc642 Merge branch 'feature/inv' into develop 2026-02-05 13:40:45 +08:00
18338781771 a521cfcaf4 借用状态 2026-02-05 13:40:38 +08:00
18338781771 385f380914 Merge branch 'feature/inv' into develop 2026-02-05 13:18:36 +08:00
18338781771 e84aba0a49 借用单筛选 2026-02-05 13:18:29 +08:00
18338781771 f67f9ddef9 Merge branch 'feature/inv' into develop 2026-02-05 11:38:55 +08:00
18338781771 a39c18b714 审批 2026-02-05 11:38:49 +08:00
18338781771 44dc6c06ee Merge branch 'feature/inv' into develop 2026-02-05 11:06:14 +08:00
18338781771 757689573b 审批id 2026-02-05 11:06:05 +08:00
18338781771 be44d1dda2 Merge branch 'feature/inv' into develop 2026-02-05 10:48:33 +08:00
18338781771 28e5afe62a 物品管理员需是同一人 2026-02-05 10:48:26 +08:00
18338781771 e922e78ae2 Merge branch 'feature/inv' into develop 2026-02-05 10:22:17 +08:00
18338781771 7bf2249ce6 移动端登录 2026-02-05 10:22:10 +08:00
18338781771 f0a92cafda Merge branch 'feature/inv' into develop
# Conflicts:
#	app/process/CheckWeb.php
2026-02-05 09:56:37 +08:00
18338781771 9686e52484 1 2026-02-05 09:55:25 +08:00
18338781771 c896bef9a6 Merge branch 'feature/inv' into develop
# Conflicts:
#	app/controller/IndexController.php
#	composer.lock
#	config/route.php
2026-02-05 09:51:21 +08:00
18338781771 a8cab8c51c 领用耗材 2026-02-05 09:33:27 +08:00
18338781771 e4f0d107ec Merge branch 'feature/crawl' into develop 2026-02-05 09:17:16 +08:00
18338781771 30f3e211af 抓取品牌 2026-02-05 09:16:24 +08:00
18338781771 eee09316df 抓取车型信息 2026-02-04 17:35:08 +08:00
18338781771 a16429ff3a 物品归还 2026-02-04 09:28:54 +08:00
mzl 59750d52f6 Merge branch 'master' into develop 2026-02-03 11:15:04 +08:00
mzl 2da3804953 Finish Hotfix-1 2026-02-03 11:15:03 +08:00
mzl eae699cd27 ts 2026-02-03 11:14:45 +08:00
18338781771 bce47e81f8 Merge branch 'hotfix/customer' into develop 2026-02-03 10:51:30 +08:00
18338781771 4ea4204ff4 渠道调整 2026-02-03 10:51:08 +08:00
18338781771 6496a40679 物品归还 2026-02-02 15:25:16 +08:00
18338781771 ab3bffe7cb 借用 2026-02-02 13:17:11 +08:00
18338781771 a8d1309349 1 2026-01-30 10:46:54 +08:00
18338781771 80d0196c3d Merge branch 'hotfix/stockn' into develop 2026-01-22 17:23:16 +08:00
18338781771 67a39917f0 过滤未提交的 2026-01-22 17:20:29 +08:00
mzl92 278dda4f7a Merge branch 'master' into develop 2026-01-22 10:15:19 +08:00
mzl92 b6851cdef0 Finish Hotfix-1 2026-01-22 10:15:19 +08:00
mzl92 733996f346 修改询盘自动配置 2026-01-22 10:15:05 +08:00
18338781771 607de6c70a 超管 2026-01-20 15:41:24 +08:00
18338781771 e7c5e17592 内勤可以看自己组员的备货单 2026-01-20 15:30:24 +08:00
mzl92 2ec89a880a Finish Hotfix-1 2026-01-08 15:08:44 +08:00
mzl92 dffaac5b07 ts 2026-01-08 15:08:35 +08:00
mzl92 907be759a0 Finish Hotfix-1 2026-01-08 15:04:47 +08:00
mzl92 f7b94da39f ts 2026-01-08 15:04:39 +08:00
mzl92 c6fada47fc Finish Hotfix-1 2026-01-08 15:02:05 +08:00
mzl92 b09e695ca7 ts 2026-01-08 15:01:51 +08:00
mzl92 de39108efa Finish Hotfix-1 2026-01-08 14:49:54 +08:00
mzl92 7dceb4b828 ts 2026-01-08 14:49:44 +08:00
mzl92 d056ba5f6f Finish Hotfix-1 2026-01-08 09:14:34 +08:00
mzl92 99551bba7f 移除加纳询盘独立分配 2026-01-08 09:14:17 +08:00
18338781771 e408f7e20e 物品领用 2026-01-07 17:38:06 +08:00
18338781771 7cafb61797 物品领用审核 2026-01-07 17:23:03 +08:00
18338781771 5a7a6a45d4 借用详情 2026-01-07 13:38:47 +08:00
18338781771 5841b342de 借用明细 2026-01-07 11:32:13 +08:00
18338781771 63011a0351 借用列表 2026-01-07 11:07:43 +08:00