develop #280

Merged

liang.cheng merged 54 commits from develop into master

liang.cheng commented

Owner

There is no content yet.

liang.cheng added 54 commits

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

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

Reviewed-on: #269

7bc3a97bbb 统一消息返回原方法保留

3bab245708 Merge pull request '统一消息返回原方法保留' (#270 ) from feature/cl into develop

Reviewed-on: #270

5a230ea962 模板一键应用所有人

ec84cd6ccf 测试

c33532c241 Merge pull request 'feature/cl' (#271 ) from feature/cl into develop

Reviewed-on: #271

b58378854b 列定制全局模板

15726f1824 高级搜索字段展示去除未启用字段

07b3bd5ae7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

af6b076584 高级搜索当前使用模板

710d6f5000 花名册修复

555e3dd604 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

6af0092549 导出列根据模板生成

a7ee4e47a3 花名册整体修复

d76c85cc19 Merge pull request 'feature/cl' (#272 ) from feature/cl into develop

Reviewed-on: #272

a6b10dcd8e 根结点树，增加部门节点数据

d3f87a3a07 根结点树，增加部门节点数据

51d34bd496 Merge branch 'feature/dxf' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

fc79e336c0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into develop

06a3d5b225 组织架构图增加定时任务存储和删除功能

58b57c81b7 Merge pull request '组织架构图增加定时任务存储和删除功能' (#273 ) from feature/cl into develop

Reviewed-on: #273

64ab363237 组织架构图增加定时任务存储和删除功能

ad9e80e1e8 根结点树，增加部门节点数据

be807d032b 编制方案、编制信息分权

6ccb4ec3d3 Merge branch 'feature/dxf' into develop

868a973bc5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

5c05759ad4 组织架构图，根结点为部门时，层级问题处理

fe60767829 组织架构图，根结点为部门时，层级问题处理

4dd6a99c1d Merge branch 'feature/dxf' into develop

94994972e3 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

d865bb976b 组织架构图，根结点为部门时，层级问题处理

816601407c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

2ea741211f 组织非标去除浏览按钮展示虚拟组织

50c7a9373e Merge pull request 'feature/cl' (#274 ) from feature/cl into develop

Reviewed-on: #274

2114368acc 组织编制信息导入bug修复

1705857817 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

53afce795a 组织编制信息导入bug修复

63df0e596f Merge pull request 'feature/cl' (#275 ) from feature/cl into develop

Reviewed-on: #275

82fd63c1a1 分权增加角色

b65dcb9fa2 Merge pull request '分权增加角色' (#276 ) from feature/cl into develop

Reviewed-on: #276

517c3135af 1.分权增加角色功能

096f1d1c6b Merge pull request '1.分权增加角色功能' (#277 ) from feature/cl into develop

Reviewed-on: #277

a303b748b5 组织树字段id为null校验

19f8cefe8a 编制对外接口自动释放冻结数取消

a939a6f222 岗位编号增加部门id拼接

c0669d1f58 1.pgsql修复 2.花名册列定制增加组织全路径

4fd548d777 1.导出增加组织全路径

137273284e Merge pull request 'feature/cl' (#278 ) from feature/cl into develop

Reviewed-on: #278

760b54710a 未启用状态部门列表显示 2.多语言补充

035ae80970 花名册导出顺序todo

4a8c85cd41 部门负责人多级显示问题处理

2d240460f1 Merge pull request 'feature/cl' (#279 ) from feature/cl into develop

Reviewed-on: #279

liang.cheng merged commit 29176caf27 into master 11 months ago

liang.cheng referenced this issue from a commit

Merge pull request 'develop' (#280) from develop into master

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

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.

Loading…

There is no content yet.

Labels Milestones

develop #280

Step 1:

Step 2: