10122 Commits
Author SHA1 Message Date
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
ljmwkx 57e50aa43a 菜单排序翻译 2024-05-04 10:42:17 +08:00
ljmwkx 1660268a18 菜单排序翻译 2024-05-04 10:40:57 +08:00
李鹏宇 e3de79944d 测试 2024-04-13 19:42:18 +08:00
李鹏宇 8d01b177c2 教学测试 2024-04-13 19:38:41 +08:00
李鹏宇 122bd17531 add LICENSE.
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2024-04-13 04:36:21 +00:00
pengyuthon 63b8851bd3 first commit 2024-04-13 12:25:01 +08:00