liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Labels Milestones

develop #280

Merged
liang.cheng merged 54 commits from develop into master 7 months ago
Conversation 0 Commits 54 Files Changed 66
liang.cheng commented 7 months ago
Owner
There is no content yet.
liang.cheng added 54 commits 7 months ago
50b7845f26 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
liang.cheng merged commit 29176caf27 into master 7 months ago
The pull request has been merged as 29176caf27.
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.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
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#280
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'develop'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes