Commit Graph

1572 Commits (26dc405ba07daa344de5627e6408edce56e8bad5)
 

Author SHA1 Message Date
Chengliang 26dc405ba0 Merge branch 'feature/geoharbour' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour 2 months ago
Chengliang fd51b718fc 上海港湾多语言优化 2 months ago
wangjie e474007b05 #上海港湾编制需求 去掉岗位 6 months ago
Chengliang 4da963b031 多语言完善 10 months ago
Chengliang b55d2cabfa 多语言修改 10 months ago
dxfeng 3c7dc642a0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour 10 months ago
dxfeng 268b7eb0e6 Merge pull request '多语言支持' (#257) from feature/dxf into develop
Reviewed-on: #257
10 months ago
dxfeng 2c7b0fe355 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 10 months ago
dxfeng 5faffc13b6 多语言支持 10 months ago
dxfeng 78c94a84d6 多语言支持 10 months ago
liang.cheng acad79705b Merge pull request '非标多语言设置' (#256) from feature/cl into develop
Reviewed-on: #256
10 months ago
dxfeng 5495164437 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour 10 months ago
Chengliang 4deb5d9005 非标多语言设置 10 months ago
dxfeng d2603be072 Merge pull request '多语言支持' (#255) from feature/dxf into develop
Reviewed-on: #255
10 months ago
dxfeng 0c068a81f0 多语言支持 10 months ago
dxfeng f0980d5bbd Merge pull request 'feature/dxf' (#254) from feature/dxf into develop
Reviewed-on: #254
10 months ago
dxfeng 2949a33d71 组织架构图,岗位数据重复问题处理 10 months ago
dxfeng 240bb21df2 多语言支持 10 months ago
liang.cheng 82a1462529 Merge pull request 'feature/cl' (#253) from feature/cl into develop
Reviewed-on: #253
10 months ago
Chengliang d17cd0be77 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 10 months ago
Chengliang 5acd184cf1 非标多语言设置 10 months ago
dxfeng aca41e4283 Merge pull request '多语言支持' (#252) from feature/dxf into develop
Reviewed-on: #252
10 months ago
dxfeng 4e29257903 多语言支持 11 months ago
Chengliang 0beebdfc70 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 11 months ago
dxfeng 795e15bc9f Merge pull request 'feature/dxf' (#251) from feature/dxf into develop
Reviewed-on: #251
11 months ago
dxfeng 785218c144 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 11 months ago
dxfeng 31b9267493 多语言支持 11 months ago
dxfeng 7483b30459 Merge pull request 'feature/dxf' (#250) from feature/dxf into develop
Reviewed-on: #250
11 months ago
dxfeng 554b3b75df Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 11 months ago
dxfeng 830c3f32ad 多语言支持 11 months ago
Chengliang fb07a71a28 非标多语言设置 11 months ago
dxfeng d802a3b200 多语言支持 11 months ago
Chengliang ec4e6fac9a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 11 months ago
dxfeng b3c6f11626 Merge pull request '多语言支持' (#249) from feature/dxf into develop
Reviewed-on: #249
11 months ago
Chengliang bbf2c74727 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 11 months ago
dxfeng 0b6c0ae11e 多语言支持 11 months ago
Chengliang 7fedc8dcff 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 11 months ago
liang.cheng 750f23d603 Merge pull request 'feature/cl' (#248) from feature/cl into develop
Reviewed-on: #248
11 months ago
Chengliang dfc0082afd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 11 months ago
dxfeng 0fba281b73 Merge pull request '多语言支持' (#247) from feature/dxf into develop
Reviewed-on: #247
11 months ago
Chengliang 1d90322edd 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 11 months ago
dxfeng eed628b156 多语言支持 11 months ago
dxfeng 412af567f8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour 11 months ago
liang.cheng 940838cc1d Merge pull request 'feature/cl' (#246) from feature/cl into develop
Reviewed-on: #246
11 months ago
dxfeng cd87843b3f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour 11 months ago
Chengliang 973862ba97 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 11 months ago
Chengliang 1e2b595d99 多语言sql记录 翻译第三次 组织架构图多语言数据接口编写 11 months ago
dxfeng 414b62d891 Merge pull request '多语言支持' (#245) from feature/dxf into develop
Reviewed-on: #245
11 months ago
dxfeng 9f991859d6 多语言支持 11 months 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
11 months ago