Commit Graph

1236 Commits

Author SHA1 Message Date
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 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 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
18338781771 24e45f93db 邮件 2026-01-04 14:40:43 +08:00
18338781771 f60b365361 Merge branch 'hotfix/email' into develop 2026-01-04 13:39:40 +08:00
18338781771 8382a47a8c 邮件处理 2026-01-04 13:32:15 +08:00
18338781771 ded377a758 Merge branch 'hotfix/email' into develop 2026-01-04 13:26:27 +08:00
18338781771 2c00a35b6a 发布人 2026-01-04 13:26:00 +08:00
18338781771 4537df63c2 Merge branch 'hotfix/email' into develop 2026-01-04 11:46:15 +08:00
18338781771 259a7d2ae6 判断询盘 2026-01-04 11:46:04 +08:00
18338781771 d76fec4624 Merge branch 'hotfix/email' into develop 2026-01-04 11:03:18 +08:00
18338781771 279139e18f 1 2026-01-04 11:01:29 +08:00
mzl92 62d86c634c Merge branch 'master' into develop 2026-01-04 10:48:04 +08:00
mzl92 4d957e8f43 Finish Hotfix-1 2026-01-04 10:48:03 +08:00
mzl92 57251718b4 调整询盘分配人员 2026-01-04 10:47:46 +08:00
18338781771 9fc890f8cd Merge branch 'feature/eamil' into develop 2025-12-26 14:13:36 +08:00
18338781771 0bcd9bf029 多邮箱处理 2025-12-26 14:12:54 +08:00
18338781771 927f1d9c28 邮件分配 2025-12-26 14:04:42 +08:00
mzl92 6289b545f5 Merge branch 'master' into develop 2025-12-25 16:11:53 +08:00
mzl92 05096bc5ed Finish Hotfix-1 2025-12-25 16:11:52 +08:00
mzl92 376411dd79 Merge branch 'hotfix/Hotfix-1' into develop
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-12-25 16:10:24 +08:00
mzl92 ece685fbe5 ts 2025-12-25 16:09:50 +08:00
mzl92 83ff52c1a0 Merge branch 'hotfix/Hotfix-1' into develop
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-12-25 16:08:10 +08:00
mzl92 8072388da2 ts 2025-12-25 16:07:33 +08:00
mzl92 db7f5d568c Merge branch 'hotfix/Hotfix-1' into develop 2025-12-25 16:00:35 +08:00
mzl92 f2b7d40b17 ts 2025-12-25 15:59:07 +08:00
18338781771 e514129ff6 业务主管备货单只看自己的 2025-12-24 14:02:52 +08:00
18338781771 bcf39b6037 Merge branch 'hotfix/stock' into develop 2025-12-24 13:42:40 +08:00
18338781771 a951fc39b3 业务主管只看自己的备货单 2025-12-24 13:41:14 +08:00
mzl92 9d050f4211 Merge branch 'master' into develop 2025-12-23 14:44:52 +08:00
mzl92 7c12ab54e1 Finish Hotfix-1 2025-12-23 14:44:51 +08:00
mzl92 d81fdae406 备货单审批增加兜底检查 2025-12-23 14:44:43 +08:00
mzl92 034b278b40 Merge branch 'master' into develop 2025-12-23 14:36:07 +08:00
mzl92 1e70bbe0ad Finish Hotfix-1 2025-12-23 14:36:06 +08:00
mzl92 861b8b216f 增加备货单修改兜底检查 2025-12-23 14:35:57 +08:00
mzl92 ebcabb23df Merge branch 'master' into develop
# Conflicts:
#	app/inquiry/service/FbFileImportService.php
2025-12-22 16:23:05 +08:00
mzl92 5b2590bff8 Finish Hotfix-1 2025-12-22 16:22:33 +08:00
mzl92 7d1ea71e94 ts 2025-12-22 16:22:20 +08:00
mzl92 4acb89e56a Merge branch 'master' into develop
# Conflicts:
#	config/inquiry_channel.php
2025-12-18 15:11:12 +08:00
mzl92 d171ad58c7 Finish Hotfix-1 2025-12-18 15:10:56 +08:00
mzl92 31a610664f inquiry ts 2025-12-18 15:10:43 +08:00
mzl92 d16bddcc32 Merge branch 'master' into develop
# Conflicts:
#	config/inquiry_channel.php
2025-12-16 14:22:47 +08:00
mzl92 8f60c79b7c Finish Hotfix-1 2025-12-16 14:22:29 +08:00
mzl92 5aadcac7e3 ts 2025-12-16 14:22:21 +08:00
mzl92 6434c8769e Merge branch 'master' into develop
# Conflicts:
#	config/inquiry_channel.php
2025-12-16 13:45:20 +08:00
mzl92 ca3455b219 Finish Hotfix-1 2025-12-16 13:44:47 +08:00