Mlin
|
a395024010
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-01-12 15:17:58 +08:00 |
|
Mlin
|
a677da06a6
|
花名册模板管理查询、编辑保存20230112
|
2023-01-12 15:17:38 +08:00 |
 dxfeng
|
cb814ef077
|
显示定制列穿梭框接口开发
|
2023-01-12 14:14:25 +08:00 |
|
dxfeng
|
b93a3d7b1c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-01-12 14:10:10 +08:00 |
|
dxfeng
|
a7b1f33e1a
|
显示定制列穿梭框接口开发
|
2023-01-12 14:08:51 +08:00 |
|
Mlin
|
044f963f31
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/HrmResourceService.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
# src/com/engine/organization/web/HrmResourceController.java
# src/com/engine/organization/wrapper/HrmResourceWrapper.java
|
2023-01-12 11:33:23 +08:00 |
|
Mlin
|
8750850dfa
|
花名册列定制模板查询20230112
|
2023-01-12 11:30:25 +08:00 |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
2023-01-12 09:41:58 +08:00 |
|
dxfeng
|
0f73f6e3ac
|
显示定制列穿梭框接口开发
|
2023-01-11 16:28:19 +08:00 |
|
dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
2023-01-11 15:42:41 +08:00 |
|
Mlin
|
f86562c802
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-01-11 14:48:38 +08:00 |
|
Mlin
|
71c427d1ec
|
花名册自定义字段展示20230111
|
2023-01-11 14:48:24 +08:00 |
|
dxfeng
|
4076a755f1
|
花名册高级搜索BUG修复
|
2023-01-11 14:26:13 +08:00 |
|
dxfeng
|
6e1f70ef82
|
花名册高级搜索BUG修复
|
2023-01-10 18:25:53 +08:00 |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
2023-01-10 16:52:40 +08:00 |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
2023-01-10 15:13:33 +08:00 |
|
dxfeng
|
9dbce1e8c5
|
花名册高级搜索BUG修复
|
2023-01-10 14:08:41 +08:00 |
|
dxfeng
|
4ba6d5c21e
|
花名册高级搜索BUG修复
|
2023-01-10 11:37:28 +08:00 |
|
dxfeng
|
9e6cc7da2a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-01-09 18:07:20 +08:00 |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
2023-01-09 18:06:57 +08:00 |
 Chengliang
|
07786bc2a6
|
花名册增加按钮
|
2023-01-09 14:59:26 +08:00 |
|
dxfeng
|
01c042ebbc
|
高级搜索表单完善
|
2023-01-09 10:27:30 +08:00 |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
2023-01-06 17:20:29 +08:00 |
|
dxfeng
|
92c51cfe18
|
花名册高级搜索相关接口
|
2023-01-06 15:35:38 +08:00 |
|
dxfeng
|
ce2c34cfdd
|
BUG修复,岗位关联关系调整
|
2022-12-13 10:42:35 +08:00 |
|
dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2022-12-09 15:07:34 +08:00 |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2022-12-09 14:29:20 +08:00 |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2022-11-30 16:06:40 +08:00 |
|
dxfeng
|
40a6540a1d
|
部门管理功能逻辑调整
|
2022-11-30 15:55:27 +08:00 |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2022-11-29 09:54:18 +08:00 |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2022-11-28 11:15:54 +08:00 |
|
dxfeng
|
ae2e5bb5a4
|
人员Mapper整合
|
2022-11-21 10:58:12 +08:00 |
|
dxfeng
|
47c09cac9a
|
导入自动编号
|
2022-11-16 17:54:57 +08:00 |
|
dxfeng
|
05364f9265
|
BUG修复
|
2022-11-16 13:39:56 +08:00 |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
2022-11-09 16:58:09 +08:00 |
|
dxfeng
|
c03a7c599a
|
岗位按钮、组织架构图 BUG修复
|
2022-11-08 15:21:29 +08:00 |
|
dxfeng
|
be90013ca0
|
组织架构图分权功能
|
2022-11-02 10:55:15 +08:00 |
|
dxfeng
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
2022-11-01 10:05:43 +08:00 |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
2022-10-27 14:39:35 +08:00 |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
2022-10-25 15:43:02 +08:00 |
|
dxfeng
|
a36648ea39
|
花名册树BUG
|
2022-10-25 11:09:14 +08:00 |
|
dxfeng
|
b446dbdb53
|
人员导入、花名册左侧树BUG修复
|
2022-10-24 19:06:07 +08:00 |
|
dxfeng
|
3b4c59ae8c
|
人员相关BUG修复
|
2022-10-21 17:44:53 +08:00 |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
2022-10-21 15:57:55 +08:00 |
|
dxfeng
|
52c8b86adb
|
人员关联调整
|
2022-10-21 09:28:33 +08:00 |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
2022-10-20 09:07:32 +08:00 |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
2022-10-17 17:16:26 +08:00 |
|
dxfeng
|
396a4570d0
|
BUG修复
|
2022-10-17 11:35:46 +08:00 |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
2022-10-14 09:13:28 +08:00 |
|
dxfeng
|
3ac7c2b959
|
聚才林花名册
|
2022-10-12 15:28:11 +08:00 |