 李鹏宇
|
ad0fecaffd
|
Merge branch 'master' into dev_zhou
# Conflicts:
# yuthon_salary/wizard/party_meal_wizard.py
# yuthon_salary/wizard/party_send_wizard.py
|
2026-01-07 16:20:25 +08:00 |
|
|
李鹏宇
|
18144abdd2
|
添加功能
|
2026-01-07 16:18:38 +08:00 |
|
|
李鹏宇
|
498645adbf
|
!7679 !7678 添加功能
Merge pull request !7679 from 李鹏宇/dev
|
2026-01-07 07:22:24 +00:00 |
|
|
李鹏宇
|
f379863ecd
|
!7678 添加功能
Merge pull request !7678 from 李鹏宇/dev_zhou
|
2026-01-07 07:22:05 +00:00 |
|
|
李鹏宇
|
189e1a4205
|
添加功能
|
2026-01-07 15:20:46 +08:00 |
|
|
李鹏宇
|
64b0bf387f
|
!7676 !7675 添加功能
Merge pull request !7676 from 李鹏宇/dev
|
2026-01-07 07:15:57 +00:00 |
|
|
李鹏宇
|
6f9473c7e7
|
!7677 添加功能
Merge pull request !7677 from 李鹏宇/dev_zhou
|
2026-01-07 07:15:32 +00:00 |
|
|
李鹏宇
|
a8af507558
|
添加功能
|
2026-01-07 15:14:58 +08:00 |
|
|
李鹏宇
|
20b40f2466
|
!7675 添加功能
Merge pull request !7675 from 李鹏宇/dev_zhou
|
2026-01-07 07:12:21 +00:00 |
|
|
李鹏宇
|
ef39d85bef
|
添加功能
|
2026-01-07 15:11:56 +08:00 |
|
|
李鹏宇
|
80e13f052e
|
添加功能
|
2026-01-07 15:11:04 +08:00 |
|
|
李鹏宇
|
85e58684e9
|
!7674 !7673 添加功能
Merge pull request !7674 from 李鹏宇/dev
|
2026-01-07 06:48:16 +00:00 |
|
|
李鹏宇
|
adb9b25c82
|
!7673 添加功能
Merge pull request !7673 from dev_zhou
|
2026-01-07 06:47:36 +00:00 |
|
|
李鹏宇
|
02dbfc225f
|
添加功能
|
2026-01-07 14:46:32 +08:00 |
|
|
李鹏宇
|
8428be8abe
|
!7672 1
Merge pull request !7672 from 李鹏宇/dev
|
2026-01-07 05:39:33 +00:00 |
|
|
pengyuthon
|
7e7139ca7c
|
1
|
2026-01-07 13:39:04 +08:00 |
|
|
pengyuthon
|
d36cd6eb91
|
1
|
2026-01-07 13:37:35 +08:00 |
|
|
李鹏宇
|
ddc00a0c34
|
!7671 1
Merge pull request !7671 from 李鹏宇/dev
|
2026-01-07 05:31:33 +00:00 |
|
|
pengyuthon
|
c85e5318c0
|
1
|
2026-01-07 13:31:05 +08:00 |
|
|
李鹏宇
|
77e829a2c1
|
!7670 1
Merge pull request !7670 from 李鹏宇/dev
|
2026-01-07 05:29:24 +00:00 |
|
|
pengyuthon
|
2fec3fe4cd
|
1
|
2026-01-07 13:28:28 +08:00 |
|
|
李鹏宇
|
48bc0877b9
|
!7669 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !7669 from 李鹏宇/dev
|
2026-01-07 05:14:44 +00:00 |
|
|
pengyuthon
|
def3e59871
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-07 13:14:09 +08:00 |
|
|
pengyuthon
|
38c0315830
|
1
|
2026-01-07 13:13:46 +08:00 |
|
|
李鹏宇
|
5f60fb4578
|
!7668 !7667 添加功能
Merge pull request !7668 from 李鹏宇/dev
|
2026-01-07 04:19:45 +00:00 |
|
|
李鹏宇
|
3ee1bede84
|
!7667 添加功能
Merge pull request !7667 from 李鹏宇/dev_zhou
|
2026-01-07 04:19:26 +00:00 |
|
|
李鹏宇
|
a29c24a078
|
添加功能
|
2026-01-07 12:18:56 +08:00 |
|
|
李鹏宇
|
934c11b827
|
!7666 !7665 添加功能
Merge pull request !7666 from 李鹏宇/dev
|
2026-01-07 04:13:44 +00:00 |
|
|
李鹏宇
|
2a7d3633a1
|
!7665 添加功能
Merge pull request !7665 from 李鹏宇/dev_zhou
|
2026-01-07 04:13:21 +00:00 |
|
|
李鹏宇
|
2f489fbaa7
|
添加功能
|
2026-01-07 12:12:41 +08:00 |
|
|
李鹏宇
|
dfe3ca94b4
|
打印更改
|
2026-01-07 12:07:07 +08:00 |
|
|
李鹏宇
|
3f588708ef
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev
|
2026-01-07 12:06:43 +08:00 |
|
|
李鹏宇
|
be94900e12
|
!7664 !7663 添加功能
Merge pull request !7664 from 李鹏宇/dev
|
2026-01-07 04:06:35 +00:00 |
|
|
李鹏宇
|
0ca016b28e
|
!7663 添加功能
Merge pull request !7663 from dev_zhou
|
2026-01-07 04:06:12 +00:00 |
|
|
李鹏宇
|
b43e9027dd
|
添加功能
|
2026-01-07 12:05:24 +08:00 |
|
|
李鹏宇
|
612c6e2ea0
|
!7662 !7661 添加功能
Merge pull request !7662 from 李鹏宇/dev
|
2026-01-07 04:03:35 +00:00 |
|
|
李鹏宇
|
0d0181aceb
|
!7661 添加功能
Merge pull request !7661 from 李鹏宇/dev_zhou
|
2026-01-07 04:03:09 +00:00 |
|
|
李鹏宇
|
a0bf8e7ad5
|
添加功能
|
2026-01-07 12:02:25 +08:00 |
|
|
李鹏宇
|
4e206cb10e
|
添加功能
|
2026-01-07 11:52:03 +08:00 |
|
|
李鹏宇
|
c6e8594fd1
|
添加功能
|
2026-01-07 11:50:39 +08:00 |
|
|
pengyuthon
|
07214c9a2e
|
Merge branch 'master' into dev
|
2026-01-07 11:48:03 +08:00 |
|
|
pengyuthon
|
65eb75f7e6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-07 11:47:56 +08:00 |
|
|
pengyuthon
|
7662b990ba
|
1
|
2026-01-07 11:47:39 +08:00 |
|
|
李鹏宇
|
71fc6eb46b
|
!7660 !7659 添加功能
Merge pull request !7660 from 李鹏宇/dev
|
2026-01-07 03:30:32 +00:00 |
|
|
李鹏宇
|
332f32fe70
|
!7659 添加功能
Merge pull request !7659 from 李鹏宇/dev_zhou
|
2026-01-07 03:30:14 +00:00 |
|
|
李鹏宇
|
305861ae6c
|
添加功能
|
2026-01-07 11:29:44 +08:00 |
|
|
李鹏宇
|
2a214192e3
|
!7658 !7657 添加功能
Merge pull request !7658 from 李鹏宇/dev
|
2026-01-07 03:20:57 +00:00 |
|
|
李鹏宇
|
76a306f829
|
!7657 添加功能
Merge pull request !7657 from 李鹏宇/dev_zhou
|
2026-01-07 03:20:35 +00:00 |
|
|
李鹏宇
|
69b6f5b6c6
|
添加功能
|
2026-01-07 11:20:06 +08:00 |
|
|
李鹏宇
|
7f71d6797b
|
!7656 1
Merge pull request !7656 from 李鹏宇/dev
|
2026-01-07 02:56:48 +00:00 |
|