develop #268

Merged
liang.cheng merged 105 commits from develop into master 12 months ago

105 Commits (master)

Author SHA1 Message Date
liang.cheng f033e08f0b Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: #267
12 months ago
Chengliang edfbdc9cb9 1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
12 months ago
dxfeng 51dac61a21 多语言BUG修复 12 months ago
dxfeng 0e53d8221d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 12 months ago
dxfeng 97a3c34159 BUG修复-花名册动态搜索条件BUG修复 12 months ago
liang.cheng 869f70b241 Merge pull request 'feature/cl' (#266) from feature/cl into develop
Reviewed-on: #266
12 months ago
Chengliang 267437f05a 花名册页面列定制调整 12 months ago
Chengliang 1d5f2a90be Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng f41d015019 BUG修复-部门更新BUG修复 12 months ago
dxfeng 99901f5cb9 BUG修复-花名册动态搜索条件BUG修复 12 months ago
Chengliang 3bbe1ef027 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng f2fabe198d BUG修复-花名册树不展示封存数据 12 months ago
dxfeng ec56ff8b46 DM数据库,岗位数据不展示BUG修复 12 months ago
dxfeng e477132c82 多语言BUG修复 12 months ago
Chengliang b676495a81 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng e655b65329 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 12 months ago
dxfeng c2f1f022c7 聚才林岗位,添加分部、部门字段 12 months ago
liang.cheng ab5052b3eb Merge pull request '顺胜v5.0开发' (#265) from feature/cl into develop
Reviewed-on: #265
12 months ago
Chengliang 28145a52dc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng 6054983dbc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 12 months ago
dxfeng 0b0fd72931 花名册显示定制模板保存BUB修复 12 months ago
Chengliang 6fd0286357 顺胜v5.0开发 1 year ago
dxfeng b31ee6a16b Merge pull request '花名册树,同级情况下,部门展示在分部前面' (#264) from feature/dxf into develop
Reviewed-on: #264
1 year ago
dxfeng 6e6c66687b 花名册树,同级情况下,部门展示在分部前面 1 year ago
dxfeng c44a6784fd Merge pull request '架构图BUG修复' (#263) from feature/dxf into develop
Reviewed-on: #263
1 year ago
dxfeng 4d88d2f063 架构图BUG修复 1 year ago
dxfeng 251a001eac Merge pull request 'feature/dxf' (#262) from feature/dxf into develop
Reviewed-on: #262
1 year ago
dxfeng 75b381f6d8 组织树,部门名称取简称 1 year ago
dxfeng 37f0361d92 花名册树,同级情况下,部门展示在分部前面 1 year ago
dxfeng f928ea04d5 人员卡片,排序、去除附件字段 1 year ago
liang.cheng fcf177c194 Merge pull request 'feature/cl' (#261) from feature/cl into develop
Reviewed-on: #261
1 year ago
Chengliang e7dc7e91fc 编制信息导入 1 year ago
Chengliang 2dadec37cd 编制信息导入 1 year ago
Chengliang eb477c7016 多语言完善 1 year ago
Chengliang e97862f67e 多语言完善 1 year ago
Chengliang d68b409a63 组织架构图功能完善 1 year ago
Chengliang 6349b0ce04 组织架构图功能完善 1 year ago
dxfeng 91ca23bc27 Merge pull request '多语言支持' (#260) from feature/dxf into develop
Reviewed-on: #260
1 year ago
dxfeng 165cdfadd3 多语言支持 1 year ago
dxfeng 5ad0c97dab Merge pull request 'feature/dxf' (#259) from feature/dxf into develop
Reviewed-on: #259
1 year ago
dxfeng c6d82e66ff Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
liang.cheng 92bea38ad3 Merge pull request 'feature/cl' (#258) from feature/cl into develop
Reviewed-on: #258
1 year ago
dxfeng 04128544ec 多语言支持 1 year ago
Chengliang ed6edca504 小地球设置 1 year ago
Chengliang 33b32e602c 多语言补充 1 year ago
Chengliang 1563b76db2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
dxfeng 268b7eb0e6 Merge pull request '多语言支持' (#257) from feature/dxf into develop
Reviewed-on: #257
1 year ago
dxfeng 2c7b0fe355 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng 5faffc13b6 多语言支持 1 year ago
dxfeng 78c94a84d6 多语言支持 1 year ago
liang.cheng acad79705b Merge pull request '非标多语言设置' (#256) from feature/cl into develop
Reviewed-on: #256
1 year ago
Chengliang be82ddfb9e Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 4deb5d9005 非标多语言设置 1 year ago
dxfeng d2603be072 Merge pull request '多语言支持' (#255) from feature/dxf into develop
Reviewed-on: #255
1 year ago
dxfeng 0c068a81f0 多语言支持 1 year ago
dxfeng f0980d5bbd Merge pull request 'feature/dxf' (#254) from feature/dxf into develop
Reviewed-on: #254
1 year ago
dxfeng 2949a33d71 组织架构图,岗位数据重复问题处理 1 year ago
dxfeng 240bb21df2 多语言支持 1 year ago
liang.cheng 82a1462529 Merge pull request 'feature/cl' (#253) from feature/cl into develop
Reviewed-on: #253
1 year ago
Chengliang d17cd0be77 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 5acd184cf1 非标多语言设置 1 year ago
dxfeng aca41e4283 Merge pull request '多语言支持' (#252) from feature/dxf into develop
Reviewed-on: #252
1 year ago
dxfeng 4e29257903 多语言支持 1 year ago
Chengliang 0beebdfc70 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
dxfeng 795e15bc9f Merge pull request 'feature/dxf' (#251) from feature/dxf into develop
Reviewed-on: #251
1 year ago
dxfeng 785218c144 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng 31b9267493 多语言支持 1 year ago
dxfeng 7483b30459 Merge pull request 'feature/dxf' (#250) from feature/dxf into develop
Reviewed-on: #250
1 year ago
dxfeng 554b3b75df Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng 830c3f32ad 多语言支持 1 year ago
Chengliang fb07a71a28 非标多语言设置 1 year ago
dxfeng d802a3b200 多语言支持 1 year ago
Chengliang ec4e6fac9a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
dxfeng b3c6f11626 Merge pull request '多语言支持' (#249) from feature/dxf into develop
Reviewed-on: #249
1 year ago
Chengliang bbf2c74727 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
dxfeng 0b6c0ae11e 多语言支持 1 year ago
Chengliang 7fedc8dcff 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 1 year ago
liang.cheng 750f23d603 Merge pull request 'feature/cl' (#248) from feature/cl into develop
Reviewed-on: #248
1 year ago
Chengliang dfc0082afd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
dxfeng 0fba281b73 Merge pull request '多语言支持' (#247) from feature/dxf into develop
Reviewed-on: #247
1 year ago
Chengliang 1d90322edd 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 1 year ago
dxfeng eed628b156 多语言支持 1 year ago
liang.cheng 940838cc1d Merge pull request 'feature/cl' (#246) from feature/cl into develop
Reviewed-on: #246
1 year ago
Chengliang 973862ba97 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 1e2b595d99 多语言sql记录 翻译第三次 组织架构图多语言数据接口编写 1 year ago
dxfeng 414b62d891 Merge pull request '多语言支持' (#245) from feature/dxf into develop
Reviewed-on: #245
1 year ago
dxfeng 9f991859d6 多语言支持 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 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
Chengliang a805450cf3 去除花名册列表多余操作 1 year ago