develop #20

Merged

liang.cheng merged 121 commits from develop into master

liang.cheng commented

Owner

There is no content yet.

liang.cheng added 121 commits

f05cf6da8f BUG修复

4fa38f704c 分部管理，更新为EC

b1b2a9a88a 部门管理，更新为EC

d65551c0ee 复制BUG修复

6415ee3eb7 编制方案

6c04ffd384 编制管理

493926e758

!226 fixed

Merge pull request !226 from reset/feature/cl

077945dfa1 表结构更新

278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

0edebd1063

!227 分部、部门按钮；SQL脚本

Merge pull request !227 from dxfeng/feature/dxf

900ded1aad 表结构更新

4cb7e0db46

!228 表结构更新

Merge pull request !228 from dxfeng/feature/dxf

ba0b31f086 fixed

6765fd8fc4 左侧树排序

1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl

# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java

8553e37c22 fixed

2be21bc0e9

!229 fixed

Merge pull request !229 from reset/feature/cl

120b4efdba 不同等级方案、编号可重复

79c5f94862 导入问题处理

34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

affcbf0e38

!230 BUG修复

Merge pull request !230 from dxfeng/feature/dxf

59f76c012c 触发器，分部、部门赋值，SQL脚本

c280c5f908 fixed

91a8ad0bd3 导入BUG

c204918352

!231 bug修复

Merge pull request !231 from reset/feature/cl

0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

d6c1ea3bc7

!232 BUG修复

Merge pull request !232 from dxfeng/feature/dxf

6de1b0746f 修复富文本长度

70aa760abc

!233 修复富文本长度

Merge pull request !233 from reset/feature/cl

f6c41a3467 部门合并重写

5c66744468 部门合并、组织导入

3113ed1984

!234 部门合并、组织导入

Merge pull request !234 from dxfeng/feature/dxf

8e385537da BUG修复

34d44b6c91 部门复制

62e4b33c37

!235 部门复制

Merge pull request !235 from dxfeng/feature/dxf

76b9cd2a89 部门复制

81ad78cc82

!236 部门复制

Merge pull request !236 from dxfeng/feature/dxf

fbd608a52a 顶部按钮修改

d4628f72ed

!237 顶部按钮修改

Merge pull request !237 from reset/feature/cl

35439a442f BUG 修复

8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

db07451ece

!238 BUG 修复

Merge pull request !238 from dxfeng/feature/dxf

50e5c7312e 编制导入

5522cb7058 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

9e0f34e680

!239 编制导入

Merge pull request !239 from dxfeng/feature/dxf

16fcd76468 编制导入

2457cdd2a8

!240 编制导入

Merge pull request !240 from dxfeng/feature/dxf

4b3bb0d5f3 编制导入

1ea9dd5768

!241 编制导入

Merge pull request !241 from dxfeng/feature/dxf

29295bb464 BUG修复

ca66929235 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

e9e585990a

!242 BUG修复

Merge pull request !242 from dxfeng/feature/dxf

b494a6a96e BUG修复

1b4d7203b8 BUG修复

abf5840f72

!243 BUG修复

Merge pull request !243 from dxfeng/feature/dxf

c8eb2f3451 BUG修复

c49abcf77f BUG修复

fe668c37e7 BUG修复

672f0f9e11 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

b214ec8509 BUG修复

2632f6c857 BUG修复

7d99eb0a3a

!244 BUG修复

Merge pull request !244 from dxfeng/feature/dxf

38725f97b0 BUG修复

61aabb4ca1 测试

aa48ea933f Merge pull request '测试' (#1 ) from feature/cl into develop

Reviewed-on: #1

8a9370ee9e BUG修复

a847a4efef 兼容Oracle,达梦

7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

02e3a40cb7 Merge pull request 'feature/dxf' (#2 ) from feature/dxf into develop

Reviewed-on: #2

106d7e8bb8 更新人员、编制同步组织架构图

92d9a17d8c 组织架构图编制显示优化

02836ce37d 岗位名称校验、编制展示优化、BUG修复

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

Reviewed-on: #3

ca3a093357 bug

f16391fc9b Merge pull request 'bug' (#4 ) from feature/cl into develop

Reviewed-on: #4

c6fb0d129b 组织架构图编制、在岗,数据优化

dfb3067297 Merge pull request '组织架构图编制、在岗,数据优化' (#5 ) from feature/dxf into develop

Reviewed-on: #5

acee0bad51 人员调整,在岗数关联优化

284f778963 人员调整,在岗数关联优化

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

8289ae1c56 Merge pull request 'feature/dxf' (#6 ) from feature/dxf into develop

Reviewed-on: #6

231addfda1 人事卡片接口开发

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

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

Reviewed-on: #7

9df3349715 兼容EC岗位名称重复

eb5578fd64 编制删除

b31d5943bd Merge pull request '编制删除' (#8 ) from feature/cl into develop

Reviewed-on: #8

c78f2157f8 层级显示不一致优化

f26159506a 岗位浏览按钮、编制action BUG修复

3ac7c2b959 聚才林花名册

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

585746c723 Merge pull request 'feature/dxf' (#9 ) from feature/dxf into develop

Reviewed-on: #9

46068ab008 编制Action 添加提示信息，BUG修复

f9c33da655 人员管理完善

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

48c8101a34 Merge pull request 'feature/dxf' (#10 ) from feature/dxf into develop

Reviewed-on: #10

1d7389c872 人员卡片

cb5235a16c Merge pull request '人员卡片' (#11 ) from feature/dxf into develop

Reviewed-on: #11

4a85fc46aa 部门转移BUG修复

e2d988d83b Merge pull request '部门转移BUG修复' (#12 ) from feature/dxf into develop

Reviewed-on: #12

f36756e1fd 分部、岗位禁用功能限制

10a3921d54 Merge pull request '分部、岗位禁用功能限制' (#13 ) from feature/dxf into develop

Reviewed-on: #13

cd4d2c77bf 人员卡片BUG修复

561477c47e Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

85fb8a1d19 Merge pull request '人员卡片BUG修复' (#14 ) from feature/dxf into develop

Reviewed-on: #14

396a4570d0 BUG修复

0f57462192 Merge pull request 'BUG修复' (#15 ) from feature/dxf into develop

Reviewed-on: #15

63b6b88a96 人员管理BUG修复

414aefe41c 人事卡片BUG修复

95f81a4f00 Merge pull request '人员BUG修复' (#16 ) from feature/dxf into develop

Reviewed-on: #16

5005243758 部门合并在岗数优化

eb007f5b23 人事卡片BUG修复

adc92c8287 部门合并在岗数优化1019

1c4ee05f95 人事卡片BUG修复

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

b7e34c1d31 人员关联调整

c06ea6f2a7 Merge pull request '人员关联调整、BUG修复' (#17 ) from feature/dxf into develop

Reviewed-on: #17

52c8b86adb 人员关联调整

7004300ebb Merge pull request '人员关联调整' (#18 ) from feature/dxf into develop

Reviewed-on: #18

545ec88e07 建表

1708f8e821 Merge pull request '建表' (#19 ) from feature/cl into develop

Reviewed-on: #19

liang.cheng merged commit 89554625ca into master 3 years ago

liang.cheng referenced this issue from a commit

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

The pull request has been merged as 89554625ca.

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

Step 1:

Step 2: