Commit Graph

1550 Commits

Author SHA1 Message Date
dxfeng f0980d5bbd Merge pull request 'feature/dxf' (#254) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/254
2024-06-13 15:26:35 +08:00
dxfeng 2949a33d71 组织架构图,岗位数据重复问题处理 2024-06-13 15:23:56 +08:00
dxfeng 240bb21df2 多语言支持 2024-06-13 14:52:24 +08:00
liang.cheng 82a1462529 Merge pull request 'feature/cl' (#253) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/253
2024-06-12 17:16:42 +08:00
Chengliang d17cd0be77 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-12 17:14:36 +08:00
Chengliang 5acd184cf1 非标多语言设置 2024-06-12 17:14:19 +08:00
dxfeng aca41e4283 Merge pull request '多语言支持' (#252) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/252
2024-06-12 15:19:19 +08:00
dxfeng 4e29257903 多语言支持 2024-06-12 14:31:53 +08:00
Chengliang 0beebdfc70 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-12 11:38:50 +08:00
dxfeng 795e15bc9f Merge pull request 'feature/dxf' (#251) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/251
2024-06-12 11:34:48 +08:00
dxfeng 785218c144 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-06-12 11:33:36 +08:00
dxfeng 31b9267493 多语言支持 2024-06-12 11:33:17 +08:00
dxfeng 7483b30459 Merge pull request 'feature/dxf' (#250) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/250
2024-06-11 18:04:07 +08:00
dxfeng 554b3b75df Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-06-11 18:02:38 +08:00
dxfeng 830c3f32ad 多语言支持 2024-06-11 18:02:23 +08:00
Chengliang fb07a71a28 非标多语言设置 2024-06-11 16:29:41 +08:00
dxfeng d802a3b200 多语言支持 2024-06-11 14:28:56 +08:00
Chengliang ec4e6fac9a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-11 09:53:31 +08:00
dxfeng b3c6f11626 Merge pull request '多语言支持' (#249) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/249
2024-06-11 09:52:05 +08:00
Chengliang bbf2c74727 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-11 09:46:35 +08:00
dxfeng 0b6c0ae11e 多语言支持 2024-06-11 09:42:47 +08:00
Chengliang 7fedc8dcff 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 2024-06-06 09:36:58 +08:00
liang.cheng 750f23d603 Merge pull request 'feature/cl' (#248) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/248
2024-06-05 16:00:55 +08:00
Chengliang dfc0082afd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-05 15:54:07 +08:00
dxfeng 0fba281b73 Merge pull request '多语言支持' (#247) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/247
2024-06-05 15:53:12 +08:00
Chengliang 1d90322edd 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 2024-06-05 15:50:29 +08:00
dxfeng eed628b156 多语言支持 2024-06-05 09:19:13 +08:00
liang.cheng 940838cc1d Merge pull request 'feature/cl' (#246) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/246
2024-06-04 16:19:20 +08:00
Chengliang 973862ba97 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-04 16:14:11 +08:00
Chengliang 1e2b595d99 多语言sql记录 翻译第三次 组织架构图多语言数据接口编写 2024-06-04 16:13:52 +08:00
dxfeng 414b62d891 Merge pull request '多语言支持' (#245) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/245
2024-06-04 10:52:35 +08:00
dxfeng 9f991859d6 多语言支持 2024-06-04 10:51:47 +08:00
dxfeng 3b0a7488cc Merge pull request '多语言支持' (#244) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/244
2024-06-04 10:28:51 +08:00
dxfeng f791642364 多语言支持 2024-06-04 10:27:44 +08:00
dxfeng 6ad332cac8 Merge pull request 'feature/dxf' (#243) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/243
2024-06-03 15:45:43 +08:00
dxfeng dd19927376 多语言支持 2024-06-03 15:43:47 +08:00
dxfeng 0901dc28e2 多语言支持 2024-06-03 14:03:38 +08:00
dxfeng 5deca3460e Merge pull request 'feature/dxf' (#242) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/242
2024-05-31 17:43:35 +08:00
liang.cheng 06e3fbf79c Merge pull request 'feature/cl' (#241) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/241
2024-05-31 17:38:31 +08:00
Chengliang f18fc1c021 多语言sql记录 翻译第二次 2024-05-31 17:33:49 +08:00
dxfeng c9b41c98e6 多语言支持 2024-05-31 17:02:16 +08:00
dxfeng f51fd4713e 多语言支持 2024-05-31 11:34:09 +08:00
Chengliang 20ede75d60 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-05-31 09:10:03 +08:00
dxfeng 9705c64f96 Merge pull request '多语言支持' (#240) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/240
2024-05-31 09:07:49 +08:00
dxfeng 703de629f9 多语言支持 2024-05-31 09:06:51 +08:00
Chengliang 00c1e04392 多语言sql记录 2024-05-30 18:34:50 +08:00
liang.cheng b232148b09 Merge pull request 'feature/cl' (#239) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/239
2024-05-30 09:37:02 +08:00
Chengliang 9b3f41df4d 部门合并增加记录 人员工作记录历史表 2024-05-29 18:02:28 +08:00
Chengliang 5673b44929 部门合并增加记录 人员工作记录历史表 2024-05-29 16:07:28 +08:00
Chengliang a805450cf3 去除花名册列表多余操作 2024-05-20 10:15:20 +08:00