分部、部门、岗位、人员分权功能开发 #32

Merged

dxfeng merged 3 commits from feature/dxf into develop

dxfeng commented

Collaborator

分部、部门、岗位、人员分权功能开发

分部、部门、岗位、人员分权功能开发

dxfeng added 3 commits

0b3cd0641b 分权开发

955134dc28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

 Conflicts:
	src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

895528617b 分部、部门、岗位、人员分权功能开发

dxfeng merged commit 796487941c into develop 3 years ago

dxfeng referenced this issue from a commit

Merge pull request '分部、部门、岗位、人员分权功能开发' (#32) from feature/dxf into develop

The pull request has been merged as 796487941c.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b feature/dxf develop

git pull origin feature/dxf

Step 2:

Merge the changes and update on Gitea.

git checkout develop

git merge --no-ff feature/dxf

git push origin develop

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.