Mlin
|
8ff8340d81
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-01-13 18:03:32 +08:00 |
|
Mlin
|
9d36b42da6
|
花名册模板管理日期优化
|
2023-01-13 18:03:19 +08:00 |
 dxfeng
|
0aac4a0c57
|
BUG修复
|
2023-01-13 18:01:17 +08:00 |
|
dxfeng
|
ec55baf5fe
|
BUG修复
|
2023-01-13 17:39:52 +08:00 |
|
dxfeng
|
6d8aaf063b
|
BUG修复
|
2023-01-13 16:50:54 +08:00 |
|
Mlin
|
547264d755
|
花名册模板列定制优化20230113
|
2023-01-13 16:37:11 +08:00 |
|
Mlin
|
78682a47c7
|
花名册模板列定制优化20230113
|
2023-01-13 16:35:34 +08:00 |
|
Mlin
|
58d5bccddc
|
花名册模板列定制列名称获取优化20230113
|
2023-01-13 14:07:33 +08:00 |
|
Mlin
|
07a82baf9c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-01-13 13:44:15 +08:00 |
|
Mlin
|
5c44a11ff3
|
花名册模板列定制功能优化20230113
|
2023-01-13 13:44:05 +08:00 |
|
dxfeng
|
1bb7b67133
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-01-13 09:47:15 +08:00 |
|
dxfeng
|
1c9dce7c0b
|
BUG修复
|
2023-01-13 09:46:37 +08:00 |
|
Mlin
|
2fba3b50b9
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2023-01-13 09:02:11 +08:00 |
|
Mlin
|
e3a78a05c7
|
花名册模板列定制20230113
|
2023-01-13 08:50:27 +08:00 |
|
dxfeng
|
ebb4e88d0d
|
BUG修复
|
2023-01-12 18:18:44 +08:00 |
|
dxfeng
|
f79ad8681f
|
BUG修复
|
2023-01-12 16:49:54 +08:00 |
|
dxfeng
|
563070a539
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-01-12 15:46:01 +08:00 |
|
dxfeng
|
15b14cf4b1
|
显示定制列穿梭框接口开发
|
2023-01-12 15:45:43 +08:00 |
|
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 |