Commit Graph
16478 Commits
Author SHA1 Message Date
李鹏宇 dfebf9a286 !9230 添加功能
Merge pull request !9230 from 李鹏宇/dev_zhou
2026-03-04 06:34:44 +00:00
李鹏宇 6d95bab452 添加功能 2026-03-04 14:34:17 +08:00
pengyuthon ab25637569 公告 2026-03-04 14:21:24 +08:00
pengyuthon 3af63a22a7 公告 2026-03-04 14:09:59 +08:00
pengyuthon d122d96fc5 批量创建 2026-03-04 13:47:57 +08:00
pengyuthon a69dd3b3ef Merge remote-tracking branch 'origin/dev' into dev 2026-03-04 12:29:54 +08:00
pengyuthon 59869b71f4 批量创建 2026-03-04 12:29:41 +08:00
李鹏宇 043c3d2a4f !9224 添加功能
Merge pull request !9224 from 李鹏宇/dev_zhou
2026-03-04 04:05:00 +00:00
李鹏宇 4c3b3eef3b 添加功能 2026-03-04 12:04:20 +08:00
李鹏宇 192cde6e97 !9222 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9222 from 李鹏宇/dev_wang
2026-03-04 04:03:49 +00:00
李鹏宇 93a5b15107 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-04 12:02:51 +08:00
李鹏宇 2e91756fc8 确认按钮 2026-03-04 12:02:06 +08:00
李鹏宇 159cc92ba7 !9220 添加功能
Merge pull request !9220 from 李鹏宇/dev_zhou
2026-03-04 04:00:44 +00:00
李鹏宇 b9a5d03a04 添加功能 2026-03-04 12:00:13 +08:00
李鹏宇 4decc10a23 !9218 添加功能
Merge pull request !9218 from 李鹏宇/dev_zhou
2026-03-04 03:38:06 +00:00
李鹏宇 0cf3fccb6b 添加功能 2026-03-04 11:36:50 +08:00
李鹏宇 c893a6e5e8 !9216 添加功能
Merge pull request !9216 from 李鹏宇/dev_zhou
2026-03-04 03:30:55 +00:00
李鹏宇 5910bd9c63 添加功能 2026-03-04 11:30:24 +08:00
李鹏宇 bd50d6e9fb !9214 考勤确认单跳转
Merge pull request !9214 from 李鹏宇/dev_wang
2026-03-04 03:29:49 +00:00
李鹏宇 051ef88ad9 添加功能 2026-03-04 11:29:36 +08:00
李鹏宇 dbbbfa4455 考勤确认单跳转 2026-03-04 11:28:49 +08:00
pengyuthon 120d1f2321 Merge remote-tracking branch 'origin/dev' into dev 2026-03-04 11:16:01 +08:00
pengyuthon 40ece946df 1 2026-03-04 11:15:34 +08:00
李鹏宇 2c08855a94 !9211 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9211 from 李鹏宇/dev_wang
2026-03-04 03:08:34 +00:00
李鹏宇 a0baa45526 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-04 11:05:45 +08:00
李鹏宇 94013a5143 餐饮收集任务 2026-03-04 11:05:29 +08:00
pengyuthon 5a515950bf Merge remote-tracking branch 'origin/dev' into dev 2026-03-04 10:51:34 +08:00
pengyuthon 88ffc95269 1 2026-03-04 10:51:13 +08:00
李鹏宇 e5c7f6f898 !9208 添加功能
Merge pull request !9208 from 李鹏宇/dev_zhou
2026-03-04 02:49:54 +00:00
李鹏宇 74ace6d58d 添加功能 2026-03-04 10:48:43 +08:00
李鹏宇 4b2ccb5a33 !9206 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9206 from 李鹏宇/dev_wang
2026-03-04 02:38:26 +00:00
李鹏宇 619d6bc263 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-04 10:36:56 +08:00
李鹏宇 4000e6a475 餐费查询,餐费自动计算 2026-03-04 10:36:28 +08:00
李鹏宇 c77df427e4 !9203 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9203 from 李鹏宇/dev_wang
2026-03-04 02:30:29 +00:00
pengyuthon d36712b9ac 公告 2026-03-04 10:30:14 +08:00
李鹏宇 14efe63d9c Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-04 10:24:54 +08:00
李鹏宇 39213fce1f 批量开票导出 2026-03-04 10:24:40 +08:00
pengyuthon e2e8f353f5 Merge remote-tracking branch 'origin/dev' into dev 2026-03-04 10:16:19 +08:00
pengyuthon 3b5a3fa8a6 打卡 2026-03-04 10:11:51 +08:00
李鹏宇 07125ef0cf Merge branch 'master' into dev_zhou
# Conflicts:
#	yuthon_hr_attendance/models/yuthon_vacation_reports.py
2026-03-03 21:06:11 +08:00
李鹏宇 ca7231ee2e 添加功能 2026-03-03 21:05:19 +08:00
李鹏宇 a64e21565d !9202 !9201 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9202 from 李鹏宇/dev
2026-03-03 13:04:36 +00:00
李鹏宇 ba38c43214 !9201 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9201 from 李鹏宇/dev_wang
2026-03-03 13:04:10 +00:00
李鹏宇 ec2c04256a Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 21:03:33 +08:00
李鹏宇 3171002721 考勤确认单台账返回 2026-03-03 21:03:19 +08:00
李鹏宇 ac99db1451 !9200 !9199 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9200 from 李鹏宇/dev
2026-03-03 13:00:43 +00:00
李鹏宇 77a7275917 !9199 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9199 from 李鹏宇/dev_wang
2026-03-03 13:00:19 +00:00
李鹏宇 94e6b888ca !9198 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9198 from 李鹏宇/dev_wang
2026-03-03 12:59:37 +00:00
李鹏宇 3067161a4e Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 20:58:56 +08:00
李鹏宇 05398a64cc 考勤确认单台账返回 2026-03-03 20:58:43 +08:00