Labels Milestones

feature/dxf #269

Merged

dxfeng merged 2 commits from feature/dxf into develop 9 months ago

Conversation 0 Commits 2 Files Changed 14

dxfeng commented 9 months ago

Collaborator

There is no content yet.

dxfeng added 2 commits 9 months ago

93d672f14c 禁用BUG修复

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

dxfeng merged commit 803331d46f into develop 9 months ago

dxfeng referenced this issue from a commit 9 months ago

Merge pull request 'feature/dxf' (#269) from feature/dxf into develop

The pull request has been merged as 803331d46f.

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.

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

Subscribe

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#269

Write Preview

Loading…

Cancel

Save

There is no content yet.