feature/dxf #157

Closed
dxfeng wants to merge 0 commits from feature/dxf into master
dxfeng commented 2 years ago
Collaborator
There is no content yet.
dxfeng added 356 commits 2 years ago
90e6d7b765 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
#	src/com/engine/organization/web/PersonnelResumeController.java
#	src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
ab881b8d8f Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/PersonnelResumeService.java
#	src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
#	src/com/engine/organization/web/PersonnelResumeController.java
#	src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
401a37df64 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
044f963f31 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/HrmResourceService.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
#	src/com/engine/organization/web/HrmResourceController.java
#	src/com/engine/organization/wrapper/HrmResourceWrapper.java
2fba3b50b9 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
dxfeng closed this pull request 2 years ago
This pull request cannot be reopened because the branch was deleted.
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 master
git pull origin feature/dxf

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff feature/dxf
git push origin master
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.

Reference: liang.cheng/weaver-hrm-organization#157
Loading…
There is no content yet.