 dxfeng
|
9f991859d6
|
多语言支持
|
1 year ago |
|
dxfeng
|
49955f6d91
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour
Conflicts:
src/com/engine/organization/entity/staff/vo/StaffTableVO.java
|
1 year ago |
|
dxfeng
|
3b0a7488cc
|
Merge pull request '多语言支持' (#244) from feature/dxf into develop
Reviewed-on: #244
|
1 year ago |
|
dxfeng
|
f791642364
|
多语言支持
|
1 year ago |
|
dxfeng
|
c0a5d802f4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour
|
1 year ago |
|
dxfeng
|
6ad332cac8
|
Merge pull request 'feature/dxf' (#243) from feature/dxf into develop
Reviewed-on: #243
|
1 year ago |
|
dxfeng
|
dd19927376
|
多语言支持
|
1 year ago |
|
dxfeng
|
0901dc28e2
|
多语言支持
|
1 year ago |
|
dxfeng
|
5deca3460e
|
Merge pull request 'feature/dxf' (#242) from feature/dxf into develop
Reviewed-on: #242
|
1 year ago |
 liang.cheng
|
06e3fbf79c
|
Merge pull request 'feature/cl' (#241) from feature/cl into develop
Reviewed-on: #241
|
1 year ago |
|
Chengliang
|
f18fc1c021
|
多语言sql记录 翻译第二次
|
1 year ago |
|
dxfeng
|
c9b41c98e6
|
多语言支持
|
1 year ago |
|
dxfeng
|
f51fd4713e
|
多语言支持
|
1 year ago |
|
Chengliang
|
20ede75d60
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
1 year ago |
|
dxfeng
|
9705c64f96
|
Merge pull request '多语言支持' (#240) from feature/dxf into develop
Reviewed-on: #240
|
1 year ago |
|
dxfeng
|
703de629f9
|
多语言支持
|
1 year ago |
|
Chengliang
|
00c1e04392
|
多语言sql记录
|
1 year ago |
|
liang.cheng
|
b232148b09
|
Merge pull request 'feature/cl' (#239) from feature/cl into develop
Reviewed-on: #239
|
1 year ago |
|
Chengliang
|
9b3f41df4d
|
部门合并增加记录 人员工作记录历史表
|
1 year ago |
|
Chengliang
|
5673b44929
|
部门合并增加记录 人员工作记录历史表
|
1 year ago |
 wangjie
|
be31595cb0
|
#上海港湾编制需求
|
1 year ago |
|
Chengliang
|
a805450cf3
|
去除花名册列表多余操作
|
1 year ago |
|
liang.cheng
|
37fd4dca5a
|
Merge pull request 'feature/cl' (#237) from feature/cl into develop
Reviewed-on: #237
|
1 year ago |
|
Chengliang
|
5da821d653
|
组织架构图部门详细列表接口修改 （1.增加人员点击信息跳转，2.修复数据加载效率问题导致图展示不全；3.解除默认不展示岗位功能）
|
1 year ago |
|
Chengliang
|
fcb53a4ff0
|
非标功能完善
|
1 year ago |
|
Chengliang
|
a816b4eeee
|
上海港湾二开抽屉页面去除岗位维度 岗位取值建模职位名称
|
1 year ago |
Mlin
|
2918d6392b
|
港湾架构改造
|
1 year ago |
|
liang.cheng
|
6154ece836
|
Merge pull request '岗位序列导入功能修复' (#235) from feature/cl into develop
Reviewed-on: #235
|
1 year ago |
|
Chengliang
|
56d1bbc49e
|
岗位序列导入功能修复
|
1 year ago |
|
liang.cheng
|
9080b5440f
|
Merge pull request '岗位序列导入功能' (#233) from feature/cl into develop
Reviewed-on: #233
|
1 year ago |
|
Chengliang
|
ace84c3d09
|
岗位序列导入功能
|
1 year ago |
|
dxfeng
|
2d46b33600
|
Merge pull request '组织架构图分权BUG修复' (#232) from feature/dxf into develop
Reviewed-on: #232
|
1 year ago |
|
dxfeng
|
a351557e5d
|
组织架构图分权BUG修复
|
1 year ago |
|
dxfeng
|
4fa9208150
|
Merge pull request '组织架构图，在编数、在岗数显示BUG修复' (#231) from feature/dxf into develop
Reviewed-on: #231
|
1 year ago |
|
dxfeng
|
71c490cc98
|
组织架构图，在编数、在岗数显示BUG修复
|
1 year ago |
|
liang.cheng
|
4110238528
|
Merge pull request '切换维度 treeselect修复' (#230) from feature/cl into develop
Reviewed-on: #230
|
1 year ago |
|
Chengliang
|
381033ddcb
|
切换维度 treeselect修复
|
1 year ago |
|
dxfeng
|
4e3ffcc254
|
Merge pull request 'feature/dxf' (#228) from feature/dxf into develop
Reviewed-on: #228
|
2 years ago |
|
dxfeng
|
263af54990
|
分部、部门导入，自定义下拉框字段转换BUG修复
|
2 years ago |
|
dxfeng
|
025ee6283a
|
组织树BUG修复
|
2 years ago |
|
liang.cheng
|
20d5ca6861
|
Merge pull request '1.花名册定制列table字段顺序调整无效修复' (#226) from feature/cl into develop
Reviewed-on: #226
|
2 years ago |
|
Chengliang
|
06b0d09f92
|
1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
|
2 years ago |
|
liang.cheng
|
b3e7fd8398
|
Merge pull request 'feature/cl' (#225) from feature/cl into develop
Reviewed-on: #225
|
2 years ago |
|
Chengliang
|
4f446b20d0
|
历史编制 在职人数显示sql更改
|
2 years ago |
|
Chengliang
|
b4aa07b797
|
组织架构图一级分部分权条件修复
|
2 years ago |
|
liang.cheng
|
ab5e011640
|
Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop
Reviewed-on: #224
|
2 years ago |
|
Chengliang
|
7da6fd7997
|
组织架构图一级分部分权
|
2 years ago |
|
dxfeng
|
83ef5962b1
|
排序BUG修复
|
2 years ago |
|
dxfeng
|
d2aa83f7f0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
1e3cacdc6e
|
排序BUG修复
|
2 years ago |
