 pengyuthon
|
ed8dec72ee
|
批量员工更新
|
2024-05-22 18:59:02 +08:00 |
|
|
李鹏宇
|
be2e9940a6
|
!20 hong_批量更新员工
Merge pull request !20 from 李鹏宇/dev_hong
|
2024-05-22 09:11:02 +00:00 |
|
|
ONION
|
0e87669868
|
弹窗1.2
|
2024-05-22 17:06:45 +08:00 |
|
|
ONION
|
18235c4972
|
弹窗
|
2024-05-21 10:19:59 +08:00 |
|
|
李鹏宇
|
4741f98f75
|
!19 bug
Merge pull request !19 from 李鹏宇/pengyuthon-dev
|
2024-05-20 09:56:26 +00:00 |
|
|
pengyuthon
|
fc6037651c
|
bug
|
2024-05-20 17:54:15 +08:00 |
|
|
李鹏宇
|
dd0ac44415
|
!18 审批日期
Merge pull request !18 from 李鹏宇/dev_zhang
|
2024-05-20 04:33:56 +00:00 |
|
|
ONIONZHAOXI
|
cc5decd8cf
|
审批框架拓展，添加is_enable 、category_start_date、
category_end_date
三个字段。
|
2024-05-20 11:42:58 +08:00 |
|
|
李鹏宇
|
e6a36910c1
|
!17 批量创建用户
Merge pull request !17 from 李鹏宇/pengyuthon-dev
|
2024-05-19 15:31:08 +00:00 |
|
|
pengyuthon
|
008a3b996d
|
bug
|
2024-05-19 23:30:07 +08:00 |
|
|
李鹏宇
|
e8d3b81c29
|
!16 审批框架二开
Merge pull request !16 from 李鹏宇/pengyuthon-dev
|
2024-05-19 12:53:36 +00:00 |
|
|
pengyuthon
|
974fc5f0ce
|
bug
|
2024-05-19 20:52:12 +08:00 |
|
|
李鹏宇
|
5ccb00a992
|
!15 bug
Merge pull request !15 from 李鹏宇/pengyuthon-dev
|
2024-05-19 06:18:30 +00:00 |
|
|
pengyuthon
|
d0304a71aa
|
bug
|
2024-05-19 14:17:39 +08:00 |
|
|
李鹏宇
|
b1bf39c5db
|
!14 审批框架二开
Merge pull request !14 from 李鹏宇/pengyuthon-dev
|
2024-05-19 06:11:47 +00:00 |
|
|
pengyuthon
|
b0aa266c2f
|
审批框架二开
|
2024-05-19 14:06:41 +08:00 |
|
|
ljm
|
687f1581da
|
!13 审批流程
Merge pull request !13 from feature/20240504
|
2024-05-19 06:00:04 +00:00 |
|
|
ljmwkx
|
0c55ce0b05
|
审批流程
|
2024-05-19 13:57:55 +08:00 |
|
|
ljmwkx
|
b847930fc9
|
Changes
|
2024-05-18 17:19:10 +08:00 |
|
|
pengyuthon
|
bcee2fe0e1
|
职级调整,数据的预置
|
2024-05-08 10:13:24 +08:00 |
|
|
ljm
|
fe0a1a050d
|
!12 固定资产
Merge pull request !12 from feature/20240504
|
2024-05-07 13:31:29 +00:00 |
|
|
ljmwkx
|
fd8f25f6e9
|
菜单排序翻译
|
2024-05-07 21:29:49 +08:00 |
|
|
ljm
|
e113fa2900
|
!11 固定资产
Merge pull request !11 from feature/20240504
|
2024-05-07 13:21:37 +00:00 |
|
|
ljmwkx
|
00fa617b0e
|
菜单排序翻译
|
2024-05-07 21:19:14 +08:00 |
|
|
李鹏宇
|
e17a503f16
|
!10 职级
Merge pull request !10 from dev_hong
|
2024-05-07 01:26:59 +00:00 |
|
|
ONION
|
76fba3d647
|
职级配置添加字段视图预置文件_修改版本1.1
|
2024-05-06 20:30:57 +08:00 |
|
|
李鹏宇
|
ac8d29a115
|
!9 职级调整，数据预置
Merge pull request !9 from 李鹏宇/pengyuthon-dev
|
2024-05-06 10:17:08 +00:00 |
|
|
pengyuthon
|
60ee1a6239
|
职级调整,数据的预置
|
2024-05-06 18:15:12 +08:00 |
|
|
李鹏宇
|
9e0e367ae1
|
!8 职级调整
Merge pull request !8 from 李鹏宇/dev_hong
|
2024-05-06 09:22:31 +00:00 |
|
|
李鹏宇
|
d5fea65d3b
|
Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev_hong
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2024-05-06 09:22:14 +00:00 |
|
|
ONION
|
abf89b9c3d
|
职级配置添加字段视图预置文件
|
2024-05-06 11:25:41 +08:00 |
|
|
李鹏宇
|
b0743cb4ab
|
!7 职级-调整
Merge pull request !7 from 李鹏宇/pengyuthon-dev
|
2024-05-05 14:50:11 +00:00 |
|
|
pengyuthon
|
651bf4bde4
|
Merge branch 'master' into pengyuthon-dev
|
2024-05-05 22:47:55 +08:00 |
|
|
pengyuthon
|
10a2ff2c97
|
职级调整
|
2024-05-05 22:47:23 +08:00 |
|
|
ONION
|
2a72b5f304
|
Merge remote-tracking branch 'origin/master' into dev_hong
# Conflicts:
# yuthon_hr_employee/data/hr_department_data.xml
|
2024-05-04 22:56:18 +08:00 |
|
|
李鹏宇
|
b24d980ab2
|
!6 部门-上级部门
Merge pull request !6 from 李鹏宇/pengyuthon-dev
|
2024-05-04 14:44:37 +00:00 |
|
|
pengyuthon
|
f6424f03d1
|
部门-上级部门添加
|
2024-05-04 22:42:48 +08:00 |
|
|
李鹏宇
|
065ef11419
|
!5 OA角色，OA部门，数据预置
Merge pull request !5 from 李鹏宇/dev_hong
|
2024-05-04 14:22:59 +00:00 |
|
|
ONION
|
8afc8a5cf9
|
OA角色,OA部门修改添加
|
2024-05-04 14:20:46 +00:00 |
|
|
ONION
|
16b91df0bc
|
OA角色
|
2024-05-04 14:20:46 +00:00 |
|
|
ONION
|
eb2b80eb17
|
OA角色,OA部门修改添加
|
2024-05-04 18:43:37 +08:00 |
|
|
李鹏宇
|
05fb8801a9
|
!4 人事基础信息合并
Merge pull request !4 from dev_zhang
|
2024-05-04 09:51:54 +00:00 |
|
|
ONIONZHAOXI
|
8910a6824f
|
人事板块的拓展
|
2024-05-04 17:41:37 +08:00 |
|
|
ONION
|
1a50eda2ee
|
OA角色
|
2024-05-04 13:07:56 +08:00 |
|
|
ljm
|
d6ca40034a
|
!3 必填
Merge pull request !3 from feature/20240504
|
2024-05-04 04:14:44 +00:00 |
|
|
ljmwkx
|
8cf3a9282c
|
菜单排序翻译
|
2024-05-04 12:13:55 +08:00 |
|
|
ljm
|
a269a7b137
|
!2 菜单
Merge pull request !2 from feature/20240504
|
2024-05-04 04:07:24 +00:00 |
|
|
ljmwkx
|
2c7e9a89b7
|
菜单排序翻译
|
2024-05-04 12:06:51 +08:00 |
|
|
ljm
|
c9aaffe937
|
!1 菜单
Merge pull request !1 from feature/20240504
|
2024-05-04 03:55:03 +00:00 |
|
|
ljmwkx
|
d97aa512dd
|
菜单排序翻译
|
2024-05-04 11:51:18 +08:00 |
|