Commit Graph

863 Commits

Author SHA1 Message Date
mzl92 7a8c0d6cc3 Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:35:09 +08:00
mzl92 ebd917662b 修改 2025-09-09 18:34:41 +08:00
mzl92 5d853aef30 Finish mzl_dev 2025-09-09 18:03:07 +08:00
mzl92 196f16769b Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:02:53 +08:00
mzl92 7f32a6e7e8 管理端备货单 2025-09-09 18:02:10 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +08:00
18338781771 4f4f5ec074 Merge branch 'feature/stock_next' into develop 2025-09-09 17:24:23 +08:00
18338781771 e2088cc82d 翻译失败原因记录 2025-09-09 17:24:11 +08:00
18338781771 ef0e3edab3 修复合并 2025-09-09 16:59:34 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
18338781771 3dfdf7a73c Merge branch 'feature/stock_next' into develop 2025-09-09 14:55:24 +08:00
18338781771 ed5b21e349 用户列表公司筛选 2025-09-09 14:55:14 +08:00
18338781771 38062d1fb4 Merge branch 'feature/stock_next' into develop 2025-09-09 14:10:08 +08:00
18338781771 1119cc390b 文件上传 2025-09-09 14:09:57 +08:00
mzl92 99a63ff181 Finish mzl_dev 2025-09-09 13:47:32 +08:00
mzl92 feb0512d4e Merge branch 'develop' into feature/mzl_dev 2025-09-09 13:47:18 +08:00
mzl92 f5e93f2400 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:47:04 +08:00
mzl92 df14735715 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:45:46 +08:00
mzl92 663267ce5a Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:44:14 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +08:00
18338781771 2cd613eea6 Merge branch 'feature/stock_next_fanyi' into develop 2025-09-09 11:03:52 +08:00
18338781771 1c45155cf6 港口翻译 2025-09-09 11:03:19 +08:00
mzl92 f3c77c3e05 Finish mzl_dev 2025-09-08 20:02:39 +08:00
mzl92 5dd2925687 Merge branch 'develop' into feature/mzl_dev 2025-09-08 20:02:26 +08:00
mzl92 153443d20f Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-08 20:01:31 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
18338781771 50a795afb7 Merge branch 'feature/stock_next' into develop 2025-09-08 18:03:21 +08:00
18338781771 d6d421cba2 服务器文件上传 2025-09-08 18:03:09 +08:00
18338781771 fe8bce4b4c 翻译 2025-09-08 17:16:00 +08:00
mzl92 88ef71f67e Finish mzl_dev 2025-09-08 11:36:06 +08:00
mzl92 8340f678d6 Merge branch 'develop' into feature/mzl_dev 2025-09-08 11:35:45 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
18338781771 bc8c15a3a9 翻译 2025-09-08 10:37:06 +08:00
mzl92 47b68e80dd Merge branch 'master' into develop 2025-09-05 17:01:16 +08:00
mzl92 b399f85707 Finish Hotfix-1 2025-09-05 17:01:14 +08:00
mzl92 66054de8bd 修改邮件询盘时间为半小时拉取 2025-09-05 17:00:52 +08:00
mzl92 7a63b961c2 Merge branch 'master' into develop 2025-09-05 16:56:19 +08:00
mzl92 e79d183516 Finish Hotfix-1 2025-09-05 16:56:18 +08:00
mzl92 9d37048d49 调整邮件询盘脚本 2025-09-05 16:55:57 +08:00
18338781771 efb4cde4f1 1 2025-09-05 16:26:34 +08:00
18338781771 259271a7aa kpi相关接口 2025-09-05 09:43:10 +08:00
mzl92 8a4848bc75 新增生成pdf 2025-09-05 09:26:29 +08:00
mzl92 ea38afff9a 备货单完善 2025-09-04 18:22:24 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 1a35b7d9a5 Finish mzl_dev 2025-09-04 11:53:33 +08:00
mzl92 e9a3be88af Merge branch 'develop' into feature/mzl_dev 2025-09-04 11:53:19 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +08:00
18338781771 15ba0234e7 询单推送crm队列多余文件删除 2025-09-04 10:36:12 +08:00
mzl92 87679588b4 Finish mzl_dev 2025-09-04 10:27:34 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00