develop #227

Merged
liang.cheng merged 68 commits from develop into master 1 year ago
Owner
There is no content yet.
liang.cheng added 68 commits 1 year ago
4cbb658019 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
06b0d09f92 1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
liang.cheng merged commit b2dfb60622 into master 1 year ago
The pull request has been merged as b2dfb60622.
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#227
Loading…
There is no content yet.