 Chengliang
|
07b3bd5ae7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
2024-07-24 17:54:44 +08:00 |
|
Chengliang
|
15726f1824
|
高级搜索字段展示去除未启用字段
|
2024-07-24 17:54:03 +08:00 |
 dxfeng
|
b58378854b
|
列定制 全局模板
|
2024-07-24 17:53:14 +08:00 |
|
liang.cheng
|
c33532c241
|
Merge pull request 'feature/cl' (#271) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/271
|
2024-07-24 15:43:38 +08:00 |
|
Chengliang
|
ec84cd6ccf
|
测试
|
2024-07-24 15:41:32 +08:00 |
|
Chengliang
|
5a230ea962
|
模板一键应用所有人
|
2024-07-23 10:02:43 +08:00 |
|
liang.cheng
|
3bab245708
|
Merge pull request '统一消息返回原方法保留' (#270) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/270
|
2024-07-22 17:02:44 +08:00 |
|
Chengliang
|
7bc3a97bbb
|
统一消息返回原方法保留
|
2024-07-22 16:59:30 +08:00 |
|
dxfeng
|
803331d46f
|
Merge pull request 'feature/dxf' (#269) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/269
|
2024-07-19 14:32:16 +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 |
|
liang.cheng
|
869f70b241
|
Merge pull request 'feature/cl' (#266) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/266
|
2024-07-15 16:14:33 +08:00 |
|
Chengliang
|
267437f05a
|
花名册页面列定制调整
|
2024-07-15 16:05:56 +08:00 |
|
Chengliang
|
1d5f2a90be
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
2024-07-15 11:05:45 +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 |
|
Chengliang
|
3bbe1ef027
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
2024-07-12 10:52:16 +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
|
b676495a81
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
2024-07-10 16:00:38 +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 |
|
Chengliang
|
28145a52dc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
2024-07-10 11:21:27 +08:00 |
|
dxfeng
|
6054983dbc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2024-07-10 11:19:37 +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
|
b31ee6a16b
|
Merge pull request '花名册树，同级情况下，部门展示在分部前面' (#264) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/264
|
2024-07-03 18:24:29 +08:00 |
|
dxfeng
|
6e6c66687b
|
花名册树，同级情况下，部门展示在分部前面
|
2024-07-03 18:23:48 +08:00 |
|
dxfeng
|
c44a6784fd
|
Merge pull request '架构图BUG修复' (#263) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/263
|
2024-07-03 17:06:02 +08:00 |
|
dxfeng
|
4d88d2f063
|
架构图BUG修复
|
2024-07-03 17:04:22 +08:00 |
|
dxfeng
|
251a001eac
|
Merge pull request 'feature/dxf' (#262) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/262
|
2024-07-03 10:55:50 +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 |
|
liang.cheng
|
fcf177c194
|
Merge pull request 'feature/cl' (#261) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/261
|
2024-06-25 14:37:40 +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
|
e97862f67e
|
多语言完善
|
2024-06-21 14:39:31 +08:00 |
|
Chengliang
|
d68b409a63
|
组织架构图功能完善
|
2024-06-21 09:34:49 +08:00 |
|
Chengliang
|
6349b0ce04
|
组织架构图功能完善
|
2024-06-20 18:14:15 +08:00 |
|
dxfeng
|
91ca23bc27
|
Merge pull request '多语言支持' (#260) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/260
|
2024-06-19 13:49:29 +08:00 |
|
dxfeng
|
165cdfadd3
|
多语言支持
|
2024-06-19 13:46:20 +08:00 |