Commit Graph
4043 Commits
Author SHA1 Message Date
zhou e25d3f2a67 添加功能 2025-03-24 19:24:30 +08:00
zhou 4ed1dfb93d 添加功能 2025-03-24 18:52:56 +08:00
李鹏宇 1a7bba1739 1 2025-03-24 17:52:10 +08:00
李鹏宇 78d4457e37 1 2025-03-24 17:51:40 +08:00
李鹏宇 8c5410cf6a !2068 添加功能
Merge pull request !2068 from 李鹏宇/dev_zhou
2025-03-24 09:14:29 +00:00
zhou 764813ee77 添加功能 2025-03-24 17:13:50 +08:00
李鹏宇 4e6784e177 !2066 添加功能
Merge pull request !2066 from 李鹏宇/dev_zhou
2025-03-24 09:12:17 +00:00
zhou 53202ad22a 添加功能 2025-03-24 17:11:42 +08:00
李鹏宇 34dda8bccf !2064 添加功能
Merge pull request !2064 from 李鹏宇/dev_zhou
2025-03-24 08:44:12 +00:00
zhou 424ad84ae0 添加功能 2025-03-24 16:39:36 +08:00
李鹏宇 7470c583e6 !2062 添加功能
Merge pull request !2062 from 李鹏宇/dev_zhou
2025-03-24 08:14:13 +00:00
zhou 03335b019c 添加功能 2025-03-24 16:13:33 +08:00
李鹏宇 cc4b652c40 !2060 添加功能
Merge pull request !2060 from dev_zhou
2025-03-24 08:04:03 +00:00
李鹏宇 51beebf6d1 1 2025-03-24 16:03:48 +08:00
zhou e941fd164e 添加功能 2025-03-24 16:02:52 +08:00
李鹏宇 1d82e55d59 1 2025-03-24 15:52:24 +08:00
zhou 7ceaac79d8 添加功能 2025-03-24 15:50:54 +08:00
李鹏宇 b8d2323310 1 2025-03-24 15:30:33 +08:00
李鹏宇 5baefddea1 1 2025-03-24 15:27:36 +08:00
李鹏宇 890cf80a1e 1 2025-03-24 15:22:12 +08:00
李鹏宇 1cc847460b 1 2025-03-24 15:19:18 +08:00
李鹏宇 c9b2ab1d86 1 2025-03-24 15:08:04 +08:00
李鹏宇 1b93d881ab 1 2025-03-24 14:58:36 +08:00
李鹏宇 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