Commit Graph
17471 Commits
Author SHA1 Message Date
李鹏宇 b8cc6ad83e !9346 添加功能
Merge pull request !9346 from 李鹏宇/dev_zhou
2026-03-06 07:04:16 +00:00
李鹏宇 69363984e9 添加功能 2026-03-06 15:02:51 +08:00
李鹏宇 7c62bddbd1 !9345 !9344 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9345 from 李鹏宇/dev
2026-03-06 07:02:39 +00:00
李鹏宇 3d4db41831 !9344 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 !9344 from 李鹏宇/dev_wang
2026-03-06 07:02:13 +00:00
李鹏宇 6c23c786ee Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-06 15:01:27 +08:00
李鹏宇 2f30deef6d 星期 2026-03-06 15:01:16 +08:00
李鹏宇 7db5c6566b !9343 !9342 添加功能
Merge pull request !9343 from 李鹏宇/dev
2026-03-06 06:47:55 +00:00
李鹏宇 8f5e5906fe !9342 添加功能
Merge pull request !9342 from 李鹏宇/dev_zhou
2026-03-06 06:47:37 +00:00
李鹏宇 bb5ef32aa7 !9341 !9340 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9341 from 李鹏宇/dev
2026-03-06 06:47:35 +00:00
李鹏宇 bf695d5847 !9340 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 !9340 from 李鹏宇/dev_wang
2026-03-06 06:47:13 +00:00
李鹏宇 96bc6ac5a4 添加功能 2026-03-06 14:45:41 +08:00
李鹏宇 bb9e7b0970 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-06 14:43:56 +08:00
李鹏宇 7dda0df0d6 星期 2026-03-06 14:43:43 +08:00
李鹏宇 21a81b528e !9339 !9338 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9339 from 李鹏宇/dev
2026-03-06 03:59:28 +00:00
李鹏宇 0d89a370cc !9338 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 !9338 from 李鹏宇/dev_wang
2026-03-06 03:59:07 +00:00
李鹏宇 0a0a0279b1 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-06 11:58:11 +08:00
李鹏宇 901fc4cfeb 采购入库单 2026-03-06 11:57:59 +08:00
李鹏宇 598cc8a401 !9337 !9336 Merge branch 'master' into dev_zhou
Merge pull request !9337 from 李鹏宇/dev
2026-03-06 03:44:03 +00:00
李鹏宇 96ac33bcf5 !9336 Merge branch 'master' into dev_zhou
Merge pull request !9336 from 李鹏宇/dev_zhou
2026-03-06 03:29:02 +00:00
李鹏宇 1cfec7c96d Merge branch 'master' into dev_zhou
# Conflicts:
#	yuthon_hr_attendance/models/overtime_approval.py
2026-03-06 11:28:24 +08:00
李鹏宇 9f64344e63 添加功能 2026-03-06 11:25:39 +08:00
李鹏宇 c12447222b !9335 !9334 添加功能
Merge pull request !9335 from 李鹏宇/dev
2026-03-06 03:15:23 +00:00
李鹏宇 611d638ed6 !9334 添加功能
Merge pull request !9334 from 李鹏宇/dev_zhou
2026-03-06 03:15:00 +00:00
李鹏宇 a205863012 添加功能 2026-03-06 11:14:23 +08:00
李鹏宇 cb0e4b5ad7 !9333 !9332 添加功能
Merge pull request !9333 from 李鹏宇/dev
2026-03-06 02:58:42 +00:00
李鹏宇 a1c42fe2ca !9332 添加功能
Merge pull request !9332 from 李鹏宇/dev_zhou
2026-03-06 02:58:19 +00:00
李鹏宇 98bda711da 添加功能 2026-03-06 10:57:30 +08:00
李鹏宇 e3325697e9 !9331 !9330 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9331 from 李鹏宇/dev
2026-03-06 02:47:36 +00:00
李鹏宇 582adf93bb !9330 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 !9330 from 李鹏宇/dev_wang
2026-03-06 02:47:14 +00:00
李鹏宇 38315a1463 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-06 10:46:35 +08:00
李鹏宇 6ffbbadb78 党费报表 2026-03-06 10:46:08 +08:00
李鹏宇 c9eb5360d6 !9329 !9328 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9329 from 李鹏宇/dev
2026-03-06 02:30:22 +00:00
李鹏宇 55e0fc5c68 !9328 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 !9328 from 李鹏宇/dev_wang
2026-03-06 02:29:48 +00:00
李鹏宇 ae5cf42ebd Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-06 10:26:30 +08:00
李鹏宇 d320074a2f 党费报表 2026-03-06 10:26:10 +08:00
李鹏宇 7b48d29829 !9327 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !9327 from 李鹏宇/dev
2026-03-05 15:17:38 +00:00
pengyuthon f59c405b84 Merge remote-tracking branch 'origin/dev' into dev 2026-03-05 23:14:15 +08:00
pengyuthon c6dbe8355e 加班明细日志 2026-03-05 23:14:00 +08:00
李鹏宇 0932996d2a !9326 !9325 添加功能
Merge pull request !9326 from 李鹏宇/dev
2026-03-05 14:40:43 +00:00
李鹏宇 b791b12e27 !9325 添加功能
Merge pull request !9325 from 李鹏宇/dev_zhou
2026-03-05 14:40:25 +00:00
李鹏宇 e2f9c81193 添加功能 2026-03-05 22:39:43 +08:00
李鹏宇 91cfee2018 !9324 !9323 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9324 from 李鹏宇/dev
2026-03-05 14:28:54 +00:00
李鹏宇 473ac1e92a !9323 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 !9323 from 李鹏宇/dev_wang
2026-03-05 14:28:30 +00:00
李鹏宇 0fe31b01e8 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-05 22:27:40 +08:00
李鹏宇 346397c35f 考勤确认单变更 2026-03-05 22:27:26 +08:00
李鹏宇 e78b020537 !9322 !9321 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9322 from 李鹏宇/dev
2026-03-05 13:54:38 +00:00
李鹏宇 2c11704cac !9321 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 !9321 from 李鹏宇/dev_wang
2026-03-05 13:54:12 +00:00
李鹏宇 cd473d7fb7 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-05 21:53:30 +08:00
李鹏宇 00ccb455e4 考勤 2026-03-05 21:53:13 +08:00
李鹏宇 dcefb6e648 !9320 !9319 添加功能
Merge pull request !9320 from 李鹏宇/dev
2026-03-05 13:50:31 +00:00