 Chengliang
|
fe3febba66
|
Merge remote-tracking branch 'origin/develop' into 大王椰组织调整工作流提醒
|
2024-07-23 10:42:07 +08:00 |
 dxfeng
|
50b7845f26
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
|
2024-07-17 18:19:23 +08:00 |
|
dxfeng
|
93d672f14c
|
禁用BUG修复
|
2024-07-17 18:18:03 +08:00 |
|
liang.cheng
|
f033e08f0b
|
Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/267
|
2024-07-16 16:42:50 +08:00 |
|
Chengliang
|
edfbdc9cb9
|
1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
|
2024-07-16 16:40:17 +08:00 |
|
dxfeng
|
51dac61a21
|
多语言BUG修复
|
2024-07-16 14:34:48 +08:00 |
|
dxfeng
|
0e53d8221d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2024-07-16 09:12:02 +08:00 |
|
dxfeng
|
97a3c34159
|
BUG修复-花名册动态搜索条件BUG修复
|
2024-07-16 09:11:39 +08:00 |
|
Chengliang
|
267437f05a
|
花名册页面列定制调整
|
2024-07-15 16:05:56 +08:00 |
|
dxfeng
|
f41d015019
|
BUG修复-部门更新BUG修复
|
2024-07-15 11:04:39 +08:00 |
|
dxfeng
|
99901f5cb9
|
BUG修复-花名册动态搜索条件BUG修复
|
2024-07-15 09:27:33 +08:00 |
|
dxfeng
|
f2fabe198d
|
BUG修复-花名册树不展示封存数据
|
2024-07-12 10:40:34 +08:00 |
|
dxfeng
|
ec56ff8b46
|
DM数据库，岗位数据不展示BUG修复
|
2024-07-11 16:08:26 +08:00 |
|
dxfeng
|
e477132c82
|
多语言BUG修复
|
2024-07-11 16:08:02 +08:00 |
|
Chengliang
|
47fe053323
|
大王椰快速调整流程提醒走角色开发
|
2024-07-11 14:51:06 +08:00 |
|
dxfeng
|
e655b65329
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2024-07-10 15:50:21 +08:00 |
|
dxfeng
|
c2f1f022c7
|
聚才林岗位，添加分部、部门字段
|
2024-07-10 15:50:03 +08:00 |
|
liang.cheng
|
ab5052b3eb
|
Merge pull request '顺胜v5.0开发' (#265) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/265
|
2024-07-10 15:17:50 +08:00 |
|
dxfeng
|
0b0fd72931
|
花名册显示定制模板保存BUB修复
|
2024-07-10 11:18:08 +08:00 |
|
Chengliang
|
6fd0286357
|
顺胜v5.0开发
|
2024-07-05 10:49:08 +08:00 |
|
dxfeng
|
6e6c66687b
|
花名册树，同级情况下，部门展示在分部前面
|
2024-07-03 18:23:48 +08:00 |
|
dxfeng
|
4d88d2f063
|
架构图BUG修复
|
2024-07-03 17:04:22 +08:00 |
|
dxfeng
|
75b381f6d8
|
组织树，部门名称取简称
|
2024-07-03 10:49:53 +08:00 |
|
dxfeng
|
37f0361d92
|
花名册树，同级情况下，部门展示在分部前面
|
2024-07-03 10:09:13 +08:00 |
|
dxfeng
|
f928ea04d5
|
人员卡片，排序、去除附件字段
|
2024-07-03 10:08:42 +08:00 |
|
Chengliang
|
e7dc7e91fc
|
编制信息导入
|
2024-06-25 14:24:33 +08:00 |
|
Chengliang
|
2dadec37cd
|
编制信息导入
|
2024-06-24 17:47:19 +08:00 |
|
Chengliang
|
eb477c7016
|
多语言完善
|
2024-06-21 17:25:34 +08:00 |
|
Chengliang
|
d68b409a63
|
组织架构图功能完善
|
2024-06-21 09:34:49 +08:00 |
|
Chengliang
|
6349b0ce04
|
组织架构图功能完善
|
2024-06-20 18:14:15 +08:00 |
|
dxfeng
|
165cdfadd3
|
多语言支持
|
2024-06-19 13:46:20 +08:00 |
|
dxfeng
|
c6d82e66ff
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2024-06-19 09:49:52 +08:00 |
|
dxfeng
|
04128544ec
|
多语言支持
|
2024-06-19 09:48:00 +08:00 |
|
Chengliang
|
ed6edca504
|
小地球设置
|
2024-06-19 09:45:50 +08:00 |
|
dxfeng
|
5faffc13b6
|
多语言支持
|
2024-06-17 10:23:55 +08:00 |
|
dxfeng
|
78c94a84d6
|
多语言支持
|
2024-06-14 18:01:30 +08:00 |
|
dxfeng
|
0c068a81f0
|
多语言支持
|
2024-06-14 10:43:22 +08:00 |
|
dxfeng
|
2949a33d71
|
组织架构图，岗位数据重复问题处理
|
2024-06-13 15:23:56 +08:00 |
|
dxfeng
|
240bb21df2
|
多语言支持
|
2024-06-13 14:52:24 +08:00 |
|
dxfeng
|
4e29257903
|
多语言支持
|
2024-06-12 14:31:53 +08:00 |
|
dxfeng
|
31b9267493
|
多语言支持
|
2024-06-12 11:33:17 +08:00 |
|
dxfeng
|
830c3f32ad
|
多语言支持
|
2024-06-11 18:02:23 +08:00 |
|
dxfeng
|
d802a3b200
|
多语言支持
|
2024-06-11 14:28:56 +08:00 |
|
dxfeng
|
0b6c0ae11e
|
多语言支持
|
2024-06-11 09:42:47 +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 |
|
Chengliang
|
1d90322edd
|
多语言sql记录 翻译第四次 组织架构图多语言数据接口编写
|
2024-06-05 15:50:29 +08:00 |
|
dxfeng
|
eed628b156
|
多语言支持
|
2024-06-05 09:19:13 +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
|
9f991859d6
|
多语言支持
|
2024-06-04 10:51:47 +08:00 |