develop #58

Merged
liang.cheng merged 125 commits from develop into master 2 years ago
Owner
There is no content yet.
liang.cheng added 125 commits 2 years ago
f30998351f Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/thread/CompanyTriggerRunnable.java
#	src/com/engine/organization/thread/DepartmentTriggerRunnable.java
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
1992c1375d Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/OrgChartServiceImpl.java
0da123fcef Merge branch 'feature/ml' into develop
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
liang.cheng merged commit 37b09954c6 into master 2 years ago
The pull request has been merged as 37b09954c6.
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 develop master
git pull origin develop

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff develop
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#58
Loading…
There is no content yet.