Commit Graph

1205 Commits

Author SHA1 Message Date
mzl92 83ff52c1a0 Merge branch 'hotfix/Hotfix-1' into develop
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-12-25 16:08:10 +08:00
mzl92 db7f5d568c Merge branch 'hotfix/Hotfix-1' into develop 2025-12-25 16:00:35 +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
mzl92 56f8657886 ts 2025-12-16 13:44:38 +08:00
mzl92 c29c4941fc Merge branch 'develop' 2025-12-15 16:06:51 +08:00
mzl92 c796d01703 Finish mzl_inquery 2025-12-15 15:57:57 +08:00
mzl92 ab6a8806af Merge branch 'develop' into feature/mzl_inquery 2025-12-15 15:56:43 +08:00
mzl92 9f8a241e35 Merge branch 'feature/mzl_inquery' of origin 2025-12-15 07:54:28 +00:00
mzl92 8f699d5ca9 email 2025-12-15 07:51:07 +00:00
mzl92 e6f68a9946 Merge branch 'master' into develop
# Conflicts:
#	app/inquiry/utils/FbLeadHeaderMapper.php
2025-12-12 18:37:36 +08:00
mzl92 e960dd9b36 Finish Hotfix-1 2025-12-12 18:37:11 +08:00
mzl92 cd622addec ts 2025-12-12 18:37:03 +08:00
mzl92 7ac6201925 Merge branch 'master' into develop
# Conflicts:
#	app/inquiry/service/FbFileImportService.php
2025-12-12 18:12:13 +08:00
mzl92 da3794db50 Finish Hotfix-1 2025-12-12 18:11:53 +08:00
mzl92 8fab10b972 ts 2025-12-12 18:11:44 +08:00
mzl92 eea13a2a58 Merge branch 'develop'
# Conflicts:
#	app/command/InquiryImportFbCommand.php
#	app/inquiry/utils/FbLeadHeaderMapper.php
2025-12-12 17:52:20 +08:00
mzl92 358cb64fe4 Finish mzl_inquery 2025-12-12 17:50:42 +08:00
mzl92 aede027ae2 Merge branch 'develop' into feature/mzl_inquery 2025-12-12 17:50:27 +08:00
mzl92 dbe5e2e96f ts 2025-12-12 09:50:10 +00:00
mzl92 91c313f2ca Finish mzl_inquery 2025-12-12 17:48:25 +08:00
mzl92 f99b2a84ca inquiry 2025-12-12 09:47:34 +00:00
mzl92 909f169aae auto inquiry 2025-12-11 11:04:41 +00:00
mzl92 cdd6d78995 Merge branch 'master' into develop
# Conflicts:
#	app/queue/redis/InquiryToCrmNew.php
2025-12-11 15:33:06 +08:00
mzl92 1d0b51d598 Finish Hotfix-1 2025-12-11 15:32:43 +08:00
mzl92 f0af3a0cdb ts 2025-12-11 15:32:36 +08:00
mzl92 133cd0a801 Merge branch 'master' into develop
# Conflicts:
#	app/command/InquiryReissueCommand.php
2025-12-11 15:23:36 +08:00
mzl92 45a77ba12e Finish Hotfix-1 2025-12-11 15:23:13 +08:00
mzl92 85a79193a6 ts 2025-12-11 15:23:02 +08:00
mzl92 38deea3b0d Merge branch 'develop' 2025-12-11 15:07:55 +08:00
mzl92 8cdf9e9e39 Finish mzl_inquery 2025-12-11 15:07:20 +08:00
mzl92 e21f41701a Merge branch 'develop' into feature/mzl_inquery 2025-12-11 15:07:06 +08:00
mzl92 9f77b93b25 bf 2025-12-11 07:06:25 +00:00