1 #12

Merged

pxf8gw7s3 merged 44 commits from develop into main

pxf8gw7s3 commented

Owner

There is no content yet.

pxf8gw7s3 added 44 commits

df8a6ae0d4 Update MenuController.java

80219f9d1d Update RoleController.java

770bb0b5dd Update Menu.java

cd567011b1 Update RoleMenu.java

b6a34f1091 Update MenuService.java

61e27e1d5c Merge pull request '1' (#3 ) from hrm/hzz into develop

bc7433efba Update DeptController.java

45c52de7cc Update DocsController.java

65ad6b1987 Update StaffController.java

e92f98e954 Merge pull request '包括部门，文件，员工管理' (#4 ) from hrm/jwh into develop

be4d1027ec Update DeptController.java

d8fcd60dcf Update AttendanceController.java

fab07a697f Update CityController.java

af91108b13 Update DocsController.java

dfb813692b Update InsuranceController.java

7035b95cc2 Update LeaveController.java

e62f05e067 Update LoginController.java

d5e6420ab5 Update SalaryController.java

5c84f2df4b Update SalaryDeductController.java

3f38d6ee37 Update DocsController.java

03ddf78c4f Update DocsController.java

d1b4f17101 Update DeptController.java

80b8bf73ee Update DocsController.java

255389882c Update DocsController.java

6accefacc1 Update DeptController.java

020efb0cc0 Update DocsController.java

247c255be5 Update DeptController.java

34161312e9 Merge pull request '1' (#8 ) from hrm/wlk into develop

55528c5594 ADD file via upload

9c4a233943 ADD file via upload

7ada4aa366 ADD file via upload

b70fb03193 ADD file via upload

87ac6ea2ab ADD file via upload

aae6b07871 ADD file via upload

8e51b4be13 Merge pull request '1' (#9 ) from hrm/htz into develop

61bb010678 Update AttendanceController.java

65458f8c22 Update LeaveController.java

1e937a40a6 Update StaffLeaveController.java

b9897d55e4 Update attendance.js

88d702c1af Update leave.js

0093064e3b Update staffLeave.js

ffbe30edb6 Update LeaveController.java

395cd5cacf Update AttendanceController.java

30ced6f2c3 Merge pull request '2' (#11 ) from hrm/htz into develop

pxf8gw7s3 merged commit 181d249aec into main 2 months ago

pxf8gw7s3 referenced this issue from a commit

Merge pull request '1' (#12) from develop into main

The pull request has been merged as 181d249aec.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pxf8gw7s3/human-resource-management-system#12