human-resource-management-system

Commit Graph

Select branches

Hide Pull Requests

develop

hrm/htz

hrm/hzz

hrm/jwh

hrm/wlk

main

#1

#10

#11

#12

#2

#3

#4

#5

#6

#7

#8

#9

181d249aec Merge pull request '1' (#12) from develop into main main pxf8gw7s3 2025-11-20 19:31:40 +0800
30ced6f2c3 Merge pull request '2' (#11) from hrm/htz into develop #12 develop pxf8gw7s3 2025-11-20 19:30:00 +0800
395cd5cacf Update AttendanceController.java #11 #10 hrm/htz pehm6l3vs 2025-11-20 19:27:05 +0800
ffbe30edb6 Update LeaveController.java pehm6l3vs 2025-11-20 19:26:40 +0800
0093064e3b Update staffLeave.js pehm6l3vs 2025-11-20 19:20:12 +0800
88d702c1af Update leave.js pehm6l3vs 2025-11-20 19:19:51 +0800
b9897d55e4 Update attendance.js pehm6l3vs 2025-11-20 19:19:30 +0800
1e937a40a6 Update StaffLeaveController.java pehm6l3vs 2025-11-20 19:19:09 +0800
65458f8c22 Update LeaveController.java pehm6l3vs 2025-11-20 19:18:50 +0800
61bb010678 Update AttendanceController.java pehm6l3vs 2025-11-20 19:18:19 +0800
8e51b4be13 Merge pull request '1' (#9) from hrm/htz into develop pxf8gw7s3 2025-11-20 19:15:40 +0800
aae6b07871 ADD file via upload #9 pehm6l3vs 2025-11-20 19:10:36 +0800
87ac6ea2ab ADD file via upload pehm6l3vs 2025-11-20 19:10:14 +0800
b70fb03193 ADD file via upload pehm6l3vs 2025-11-20 19:09:49 +0800
7ada4aa366 ADD file via upload pehm6l3vs 2025-11-20 19:05:10 +0800
9c4a233943 ADD file via upload pehm6l3vs 2025-11-20 19:04:44 +0800
55528c5594 ADD file via upload pehm6l3vs 2025-11-20 19:02:23 +0800
34161312e9 Merge pull request '1' (#8) from hrm/wlk into develop pxf8gw7s3 2025-11-19 10:44:15 +0800
247c255be5 Update DeptController.java #8 hrm/wlk pq7sc2z5f 2025-11-19 10:43:44 +0800
020efb0cc0 Update DocsController.java pq7sc2z5f 2025-11-19 10:42:51 +0800
6accefacc1 Update DeptController.java #7 pq7sc2z5f 2025-11-19 10:38:29 +0800
255389882c Update DocsController.java pq7sc2z5f 2025-11-19 10:36:38 +0800
80b8bf73ee Update DocsController.java #6 #5 pq7sc2z5f 2025-11-19 10:33:07 +0800
d1b4f17101 Update DeptController.java pq7sc2z5f 2025-11-19 10:32:30 +0800
03ddf78c4f Update DocsController.java pq7sc2z5f 2025-11-19 10:32:05 +0800
3f38d6ee37 Update DocsController.java pq7sc2z5f 2025-11-19 10:30:55 +0800
5c84f2df4b Update SalaryDeductController.java pq7sc2z5f 2025-11-19 10:26:07 +0800
d5e6420ab5 Update SalaryController.java pq7sc2z5f 2025-11-19 10:24:57 +0800
e62f05e067 Update LoginController.java pq7sc2z5f 2025-11-19 10:23:50 +0800
7035b95cc2 Update LeaveController.java pq7sc2z5f 2025-11-19 10:22:50 +0800
dfb813692b Update InsuranceController.java pq7sc2z5f 2025-11-19 10:21:51 +0800
af91108b13 Update DocsController.java pq7sc2z5f 2025-11-19 10:20:15 +0800
fab07a697f Update CityController.java pq7sc2z5f 2025-11-19 10:14:38 +0800
d8fcd60dcf Update AttendanceController.java pq7sc2z5f 2025-11-19 10:12:47 +0800
be4d1027ec Update DeptController.java pq7sc2z5f 2025-11-19 10:11:01 +0800
e92f98e954 Merge pull request '包括部门，文件，员工管理' (#4) from hrm/jwh into develop pxf8gw7s3 2025-11-12 23:14:37 +0800
65ad6b1987 Update StaffController.java #4 hrm/jwh pox7nspca 2025-11-12 23:07:05 +0800
45c52de7cc Update DocsController.java pox7nspca 2025-11-12 23:04:21 +0800
bc7433efba Update DeptController.java pox7nspca 2025-11-12 22:55:05 +0800
61e27e1d5c Merge pull request '1' (#3) from hrm/hzz into develop pxf8gw7s3 2025-11-12 17:53:48 +0800
b6a34f1091 Update MenuService.java #3 hrm/hzz pxf8gw7s3 2025-11-12 17:52:52 +0800
cd567011b1 Update RoleMenu.java pxf8gw7s3 2025-11-12 17:51:30 +0800
770bb0b5dd Update Menu.java pxf8gw7s3 2025-11-12 17:50:54 +0800
80219f9d1d Update RoleController.java pxf8gw7s3 2025-11-12 17:50:06 +0800
df8a6ae0d4 Update MenuController.java pxf8gw7s3 2025-11-12 17:49:04 +0800
93cc37cb49 Delete '5591fea45460d97c9b49ce2da13f0f11.png' #1 pxf8gw7s3 2025-11-09 17:58:03 +0800
11a967b21a ADD file via upload pxf8gw7s3 2025-11-09 17:57:51 +0800
41382c51db Initial commit pxf8gw7s3 2025-11-09 17:49:57 +0800
48e091b463 Add dependency version #2 qiujie 2025-08-18 09:03:46 +0800
0f40a03356 Update application.yml qiujie 2025-08-17 22:29:49 +0800
078e040ee5 jdk版本 qiujie 2025-08-17 22:07:52 +0800
b2f1197a88 指明技术栈版本 qiujie 2025-08-17 21:56:32 +0800
53cc0d06ef remove ignored files from tracking qiujie 2025-08-17 16:45:20 +0800
8fbe91f3d0 chore: remove ignored files from tracking qiujie 2025-08-17 16:37:21 +0800
6bda7e5556 修改readme qiujie 2024-05-21 20:34:08 +0800
effff2c134 整合了activiti，实现了基于工作流的请假审批 qiujie 2024-04-28 22:50:43 +0800
2a43bdddda 整合了redis，实现了验证码登录功能 qiujie 2024-04-18 09:24:05 +0800
ec6ce71bf5 整合了redis，实现了验证码登录功能 qiujie 2024-04-18 09:20:14 +0800
3d892978ff 修复了一些小bug，完善了权限控制 qiujie 2024-04-13 11:55:46 +0800
b75d42a534 结合自定义指令，实现了功能点的权限控制 qiujie 2024-04-11 17:38:25 +0800
37705adcc2 实现了自定的认证、授权失败处理器，认证失败直接退出登录 qiujie 2024-04-07 11:48:21 +0800
27b0161409

Create LICENSE qiujie 2024-04-06 22:35:35 +0800
1b02b21cc5 整合了spring security qiujie 2024-04-06 22:22:42 +0800
f69326d42b edit readme qiujie 2024-03-26 19:31:01 +0800
95e658ec95 解决了当数据表格的列fixed时，行未对齐的问题 qiujie 2024-03-26 14:23:29 +0800
d4cf0c7f66 解决了当数据表格的列fixed时，行未对齐的问题 qiujie 2024-03-26 14:18:08 +0800
725b0a3c33 edit readme.md qiujie 2024-03-24 10:38:16 +0800
3cd93ed5fd 完成了加班模块 qiujie 2024-03-23 23:09:33 +0800
f4ca0615e5

Delete file directory qiujie 2023-04-06 16:32:32 +0800
6171db56f5

Delete .idea directory qiujie 2023-04-06 16:32:13 +0800
2868ebc360 解决了不能添加参保城市的问题 fellow-me 2023-04-06 15:58:37 +0800
66c7ab0006 解决了不能修改密码的问题 fellow-me 2023-03-10 18:33:49 +0800
82697de19c 解决了添加子部门时，出现异常的问题 fellow-me 2023-02-17 23:01:56 +0800
6cdc7e3ade 解决了添加子部门时出现异常的问题 fellow-me 2023-02-17 22:53:29 +0800
00cf75bde7 优化了界面，增强了搜索功能 fellow-me 2023-02-15 01:27:39 +0800
3b5d718239 显示员工默认头像 fellow-me 2023-02-04 00:35:39 +0800
65a7b7b509 员工默认头像 fellow-me 2023-02-03 09:34:22 +0800
41af5b1ad5 实现了当访问不存在的菜单时，出现404页面的功能 fellow-me 2023-02-02 23:22:10 +0800
8ac8e267b0 上传文档 fellow-me 2023-02-02 00:58:02 +0800
51a01ed483 解决了第一次点击菜单栏时，页面空白的问题 fellow-me 2023-02-01 23:41:29 +0800