 李鹏宇
|
abe034336f
|
!2050 !2049 Merge branch 'dev' into dev_zhou
Merge pull request !2050 from 李鹏宇/dev
|
2025-03-24 06:49:16 +00:00 |
|
|
李鹏宇
|
2da3d96f46
|
!2049 Merge branch 'dev' into dev_zhou
Merge pull request !2049 from 李鹏宇/dev_zhou
|
2025-03-24 06:48:37 +00:00 |
|
|
zhou
|
26eb3fac51
|
Merge branch 'dev' into dev_zhou
# Conflicts:
# yuthon_salary/models/inherit_hr_payslip.py
|
2025-03-24 14:46:43 +08:00 |
|
|
李鹏宇
|
fe62e88a8f
|
1
|
2025-03-24 14:46:41 +08:00 |
|
|
zhou
|
16d9a1f660
|
添加功能
|
2025-03-24 14:44:32 +08:00 |
|
|
李鹏宇
|
403b531636
|
!2048 1
Merge pull request !2048 from 李鹏宇/dev
|
2025-03-24 03:29:34 +00:00 |
|
|
李鹏宇
|
9978b650f7
|
1
|
2025-03-24 11:25:15 +08:00 |
|
|
李鹏宇
|
ba9072fa99
|
!2047 !2046 添加功能
Merge pull request !2047 from 李鹏宇/dev
|
2025-03-24 03:15:41 +00:00 |
|
|
李鹏宇
|
8918a7e9a8
|
!2046 添加功能
Merge pull request !2046 from dev_zhou
|
2025-03-24 03:15:12 +00:00 |
|
|
zhou
|
dff67bb101
|
添加功能
|
2025-03-24 11:14:28 +08:00 |
|
|
李鹏宇
|
9708977a02
|
1
|
2025-03-24 11:04:07 +08:00 |
|
|
李鹏宇
|
7311402ae9
|
!2045 !2044 Merge branch 'dev' into dev_zhou
Merge pull request !2045 from 李鹏宇/dev
|
2025-03-24 02:43:47 +00:00 |
|
|
李鹏宇
|
37207fe79f
|
!2044 Merge branch 'dev' into dev_zhou
Merge pull request !2044 from 李鹏宇/dev_zhou
|
2025-03-24 02:43:30 +00:00 |
|
|
zhou
|
1d993af97d
|
Merge branch 'dev' into dev_zhou
|
2025-03-24 10:42:42 +08:00 |
|
|
zhou
|
c6de94d93c
|
添加功能
|
2025-03-24 10:42:05 +08:00 |
|
|
李鹏宇
|
bf2330f345
|
!2043 !2042 添加功能
Merge pull request !2043 from 李鹏宇/dev
|
2025-03-24 02:26:57 +00:00 |
|
|
李鹏宇
|
bc8156d16b
|
Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2025-03-24 02:26:44 +00:00 |
|
|
李鹏宇
|
add84ba380
|
!2042 添加功能
Merge pull request !2042 from dev_zhou
|
2025-03-24 02:25:53 +00:00 |
|
|
李鹏宇
|
30df774044
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2025-03-24 02:23:30 +00:00 |
|
|
zhou
|
3069e8102d
|
添加功能
|
2025-03-24 10:18:14 +08:00 |
|
|
李鹏宇
|
b6dcc39a00
|
!2040 1
Merge pull request !2040 from 李鹏宇/dev
|
2025-03-23 14:50:43 +00:00 |
|
|
李鹏宇
|
b7b951a70c
|
1
|
2025-03-23 22:50:11 +08:00 |
|
|
李鹏宇
|
fab0035bdb
|
!2039 1
Merge pull request !2039 from 李鹏宇/dev
|
2025-03-23 14:46:15 +00:00 |
|
|
李鹏宇
|
57fe857b92
|
1
|
2025-03-23 22:44:27 +08:00 |
|
|
李鹏宇
|
3754d51e7f
|
!2038 1
Merge pull request !2038 from 李鹏宇/dev
|
2025-03-23 14:39:39 +00:00 |
|
|
李鹏宇
|
afd0162a83
|
Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2025-03-23 14:39:20 +00:00 |
|
|
李鹏宇
|
64b4cdee0c
|
1
|
2025-03-23 22:33:37 +08:00 |
|
|
李鹏宇
|
6ea65fbab9
|
!2037 1
Merge pull request !2037 from 李鹏宇/dev
|
2025-03-23 14:19:39 +00:00 |
|
|
李鹏宇
|
c46257b236
|
1
|
2025-03-23 22:18:39 +08:00 |
|
|
李鹏宇
|
a80d5464b4
|
!2036 !2035 添加功能
Merge pull request !2036 from 李鹏宇/dev
|
2025-03-23 09:56:03 +00:00 |
|
|
李鹏宇
|
8c64f2da3a
|
!2035 添加功能
Merge pull request !2035 from 李鹏宇/dev_zhou
|
2025-03-23 09:55:44 +00:00 |
|
|
zhou
|
a0f1b72962
|
添加功能
|
2025-03-23 17:54:53 +08:00 |
|
|
李鹏宇
|
51e2905668
|
!2034 1
Merge pull request !2034 from 李鹏宇/dev
|
2025-03-23 09:34:11 +00:00 |
|
|
李鹏宇
|
92a913c1f9
|
1
|
2025-03-23 17:33:01 +08:00 |
|
|
李鹏宇
|
ee7413e2bc
|
!2033 1
Merge pull request !2033 from 李鹏宇/dev
|
2025-03-23 09:24:07 +00:00 |
|
|
李鹏宇
|
3a88830942
|
1
|
2025-03-23 17:23:23 +08:00 |
|
|
李鹏宇
|
8e0ce1eade
|
!2032 1
Merge pull request !2032 from 李鹏宇/dev
|
2025-03-23 09:01:06 +00:00 |
|
|
李鹏宇
|
eb946e4967
|
1
|
2025-03-23 16:59:34 +08:00 |
|
|
李鹏宇
|
6b51ba5c8a
|
!2031 !2030 Merge branch 'dev' into dev_zhou
Merge pull request !2031 from 李鹏宇/dev
|
2025-03-23 08:53:23 +00:00 |
|
|
李鹏宇
|
2162490470
|
!2030 Merge branch 'dev' into dev_zhou
Merge pull request !2030 from 李鹏宇/dev_zhou
|
2025-03-23 08:53:07 +00:00 |
|
|
zhou
|
e7dad6e973
|
Merge branch 'dev' into dev_zhou
# Conflicts:
# yuthon_contract/models/inherit_hr_contract.py
|
2025-03-23 16:52:46 +08:00 |
|
|
zhou
|
d4009b80c3
|
添加功能
|
2025-03-23 16:51:57 +08:00 |
|
|
李鹏宇
|
cf53de4b82
|
!2029 1
Merge pull request !2029 from 李鹏宇/dev
|
2025-03-23 08:41:47 +00:00 |
|
|
李鹏宇
|
1868de9112
|
1
|
2025-03-23 16:40:13 +08:00 |
|
|
李鹏宇
|
65b91b0976
|
!2028 !2027 添加功能
Merge pull request !2028 from 李鹏宇/dev
|
2025-03-23 08:28:30 +00:00 |
|
|
李鹏宇
|
f9122fb61f
|
!2027 添加功能
Merge pull request !2027 from 李鹏宇/dev_zhou
|
2025-03-23 08:28:10 +00:00 |
|
|
zhou
|
149efb7924
|
添加功能
|
2025-03-23 16:27:46 +08:00 |
|
|
李鹏宇
|
ae8e1c7b29
|
!2026 !2025 添加功能
Merge pull request !2026 from 李鹏宇/dev
|
2025-03-23 08:24:00 +00:00 |
|
|
李鹏宇
|
4be8e840a6
|
!2025 添加功能
Merge pull request !2025 from 李鹏宇/dev_zhou
|
2025-03-23 08:23:41 +00:00 |
|
|
zhou
|
babc9f3911
|
添加功能
|
2025-03-23 16:23:14 +08:00 |
|