Commit Graph

1284 Commits

Author SHA1 Message Date
mzl92 bed833f790 Merge branch 'master' into develop 2026-01-08 15:02:06 +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 5570e025b4 Merge branch 'master' into develop 2026-01-08 14:49:54 +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 67139e4161 Merge branch 'master' into develop 2026-01-08 09:14:35 +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 9f96d4da3f Merge branch 'feature/inv' into develop 2026-01-07 17:38:14 +08:00
18338781771 e408f7e20e 物品领用 2026-01-07 17:38:06 +08:00
18338781771 736df0ebdf 1 2026-01-07 17:27:29 +08:00
18338781771 4c9853f72a 1 2026-01-07 17:23:37 +08:00
18338781771 90dca83487 Merge branch 'feature/inv' into develop 2026-01-07 17:23:15 +08:00
18338781771 7cafb61797 物品领用审核 2026-01-07 17:23:03 +08:00
18338781771 35f80aab1a Revert "Merge branch 'feature/inv' into develop"
This reverts commit facf0b4c10, reversing
changes made to 1221e42917.
2026-01-07 17:21:09 +08:00
18338781771 b35e536c79 物品领用审核 2026-01-07 17:20:21 +08:00
18338781771 facf0b4c10 Merge branch 'feature/inv' into develop 2026-01-07 13:39:12 +08:00
18338781771 5a7a6a45d4 借用详情 2026-01-07 13:38:47 +08:00
18338781771 1221e42917 Merge branch 'feature/inv' into develop 2026-01-07 11:32:18 +08:00
18338781771 5841b342de 借用明细 2026-01-07 11:32:13 +08:00
18338781771 4dc708e133 Merge branch 'feature/inv' into develop 2026-01-07 11:08:07 +08:00
18338781771 63011a0351 借用列表 2026-01-07 11:07:43 +08:00
18338781771 5bcca5cb12 Merge branch 'feature/inv' into develop 2026-01-07 10:58:15 +08:00
18338781771 2b529a27c8 物品借用审批列表 2026-01-07 10:57:28 +08:00
18338781771 9b36bbf227 Merge branch 'feature/inv' into develop 2026-01-07 10:49:42 +08:00
18338781771 cab15c4fab 借用列表与详情 2026-01-07 10:49:33 +08:00
18338781771 502740e106 Merge branch 'feature/inv' into develop 2026-01-07 09:44:29 +08:00
18338781771 139acd9e70 产品规格不必传处理 2026-01-07 09:42:08 +08:00
18338781771 52eac05d43 Merge branch 'feature/inv' into develop 2026-01-05 10:42:16 +08:00
18338781771 c38a53f053 物品下拉 2026-01-05 10:42:08 +08:00
18338781771 fec079ef58 Merge branch 'feature/inv' into develop 2026-01-05 10:18:35 +08:00
18338781771 07a40bf688 物品相关信息 2026-01-05 10:18:27 +08:00
18338781771 134ced1a31 Merge branch 'hotfix/email' into develop 2026-01-05 09:44:48 +08:00
18338781771 5e06b1737c Merge branch 'hotfix/email' 2026-01-05 09:44:33 +08:00
18338781771 b43335c0d9 邮件清洗查询状态过滤 2026-01-05 09:44:26 +08:00
18338781771 472f8e39a7 Merge branch 'feature/inv' into develop 2026-01-04 17:23:19 +08:00
18338781771 c2e402722d 登录 2026-01-04 17:23:10 +08:00
18338781771 90aebf9956 Merge branch 'feature/inv' into develop 2026-01-04 16:42:25 +08:00
18338781771 de9484f570 移动端回调 2026-01-04 16:42:19 +08:00
18338781771 edee50aaf9 移动端回调 2026-01-04 16:39:37 +08:00
18338781771 615e9745a0 Merge branch 'feature/inv' into develop
# Conflicts:
#	composer.lock
#	config/route.php
2026-01-04 16:29:36 +08:00
18338781771 ca757e67dd 移动端回调 2026-01-04 16:27:20 +08:00
18338781771 fd4fa0fbf3 Merge branch 'hotfix/email' into develop 2026-01-04 16:14:12 +08:00
18338781771 ac6bfcf16c Merge branch 'hotfix/email' 2026-01-04 16:13:55 +08:00
18338781771 9f74934f37 邮件 2026-01-04 16:13:21 +08:00
18338781771 8003ef49d1 Merge branch 'hotfix/email' into develop 2026-01-04 15:51:06 +08:00
18338781771 9776df8289 Merge branch 'hotfix/email' 2026-01-04 15:50:50 +08:00
18338781771 6178084612 邮件 2026-01-04 15:50:43 +08:00
18338781771 fddcbc2df8 Merge branch 'hotfix/email' into develop 2026-01-04 14:41:13 +08:00