Commit Graph

975 Commits

Author SHA1 Message Date
mzl92 9fbe77a3a9 修改认领 2025-10-30 16:42:42 +08:00
mzl92 5facb1abba Merge branch 'develop' into feature/mzl_dev 2025-10-30 14:40:35 +08:00
mzl92 077edc5fd6 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	config/route.php
2025-10-30 14:40:24 +08:00
mzl92 ef0c236130 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	config/route.php
2025-10-30 14:39:35 +08:00
mzl92 8c3a445a39 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	config/route.php
2025-10-30 14:39:10 +08:00
mzl92 a7d623656d 内勤仪表盘 2025-10-30 14:37:21 +08:00
18338781771 f004d99802 Merge branch 'feature/fin' into develop 2025-10-30 14:27:11 +08:00
18338781771 ea3d511c4d 未入账金额 2025-10-30 14:26:59 +08:00
18338781771 59f474a037 Merge branch 'feature/fin' into develop 2025-10-30 13:35:59 +08:00
18338781771 672258e594 收款统计 2025-10-30 13:35:53 +08:00
18338781771 9f944ae92c 匹配排序优化 2025-10-30 09:52:20 +08:00
18338781771 c2d291bed4 Merge branch 'feature/fin' into develop 2025-10-29 18:38:42 +08:00
18338781771 f3b1c9bae4 付款记录排序 2025-10-29 18:38:37 +08:00
18338781771 346d67c084 超过24小时邮件通知提交入账资料 2025-10-29 18:05:23 +08:00
18338781771 eacdb93be2 Merge branch 'feature/fin' into develop 2025-10-29 15:58:29 +08:00
18338781771 cf45acbf0f 入账资料时间 2025-10-29 15:58:23 +08:00
18338781771 b235747a9a Merge branch 'feature/fin' into develop 2025-10-29 15:48:09 +08:00
18338781771 b440c03241 超时未认领筛选 2025-10-29 15:47:51 +08:00
18338781771 2b2e821779 Merge branch 'feature/fin' into develop 2025-10-29 14:23:53 +08:00
18338781771 07c0b2a2f3 收付款 2025-10-29 14:14:40 +08:00
18338781771 6baee549c0 Merge branch 'hotfix/series' into develop 2025-10-29 11:48:18 +08:00
18338781771 e62becd30b 上传文件优化 2025-10-29 11:46:08 +08:00
18338781771 8a1b2f2369 系统设置 2025-10-28 17:05:23 +08:00
18338781771 2127473290 系统设置 2025-10-28 16:59:51 +08:00
18338781771 38effed458 Merge branch 'feature/fin' into develop 2025-10-27 14:52:10 +08:00
18338781771 1bd2eee8db 入账时间 2025-10-27 14:52:04 +08:00
18338781771 36c7d19319 Merge branch 'feature/fin' into develop 2025-10-27 11:57:06 +08:00
18338781771 19cb169abd 历史记录 2025-10-27 11:57:00 +08:00
18338781771 a85fa8f072 Merge branch 'feature/fin' into develop 2025-10-27 10:57:54 +08:00
18338781771 83d76b16b4 确认入账 2025-10-27 10:57:47 +08:00
18338781771 2f9f483661 Merge branch 'feature/fin' into develop
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-10-27 10:23:52 +08:00
18338781771 6184689e81 Merge branch 'feature/audit' 2025-10-24 16:32:52 +08:00
18338781771 7fd28461fe Merge branch 'feature/audit' into develop 2025-10-24 16:32:34 +08:00
18338781771 cd6c4b425d 入参搜索 2025-10-24 16:32:23 +08:00
mzl92 cb4a3a3cd3 Merge branch 'develop' 2025-10-24 15:47:46 +08:00
mzl92 5cc67b78f1 Finish mzl_dev 2025-10-24 15:47:18 +08:00
mzl92 770664e70f Merge branch 'develop' into feature/mzl_dev 2025-10-24 15:47:12 +08:00
mzl92 6bd4ed9ec3 ts备货单 2025-10-24 15:46:20 +08:00
18338781771 15309c537f Merge branch 'feature/audit' 2025-10-24 15:25:55 +08:00
18338781771 211fe575b8 Merge branch 'feature/audit' into develop 2025-10-24 15:25:44 +08:00
18338781771 24b3ef4415 日志排序 2025-10-24 15:25:29 +08:00
18338781771 9fdce3eaf3 Merge branch 'feature/audit' 2025-10-24 15:02:20 +08:00
18338781771 18786591b1 Merge branch 'feature/audit' into develop 2025-10-24 15:02:01 +08:00
mzl92 b47d23cd67 Merge branch 'develop' 2025-10-24 11:15:09 +08:00
mzl92 1c3585b079 Finish mzl_dev 2025-10-24 11:04:35 +08:00
mzl92 8db33a40a4 Merge branch 'develop' into feature/mzl_dev 2025-10-24 11:04:27 +08:00
mzl92 c1ab40031d 调整采购单 2025-10-24 11:02:54 +08:00
mzl92 2c8efc18f9 Finish mzl_dev 2025-10-24 10:44:12 +08:00
mzl92 03ab55bd63 Merge branch 'develop' into feature/mzl_dev 2025-10-24 10:44:00 +08:00
mzl92 4326bcd68b 调整备货单 2025-10-24 10:43:36 +08:00