 dxfeng
|
bcdc52d894
|
Merge pull request '显示定制列穿梭框接口开发' (#138) from feature/dxf into develop
Reviewed-on: #138
|
2 years ago |
|
dxfeng
|
563070a539
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
15b14cf4b1
|
显示定制列穿梭框接口开发
|
2 years ago |
Mlin
|
a395024010
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a677da06a6
|
花名册模板管理查询、编辑保存20230112
|
2 years ago |
|
dxfeng
|
7d96731841
|
Merge pull request '显示定制列穿梭框接口开发' (#137) from feature/dxf into develop
Reviewed-on: #137
|
2 years ago |
|
dxfeng
|
cb814ef077
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
b93a3d7b1c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
a7b1f33e1a
|
显示定制列穿梭框接口开发
|
2 years ago |
|
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
|
2 years ago |
|
Mlin
|
8750850dfa
|
花名册列定制模板查询20230112
|
2 years ago |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
2 years ago |
|
dxfeng
|
70438b649a
|
Merge pull request '显示定制列穿梭框接口开发' (#136) from feature/dxf into develop
Reviewed-on: #136
|
2 years ago |
|
dxfeng
|
0f73f6e3ac
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
98cdb00a39
|
Merge pull request '显示定制列穿梭框接口开发' (#135) from feature/dxf into develop
Reviewed-on: #135
|
2 years ago |
|
dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
f86562c802
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
71c427d1ec
|
花名册自定义字段展示20230111
|
2 years ago |
|
dxfeng
|
2794335dc2
|
Merge pull request '花名册高级搜索BUG修复' (#134) from feature/dxf into develop
Reviewed-on: #134
|
2 years ago |
|
dxfeng
|
4076a755f1
|
花名册高级搜索BUG修复
|
2 years ago |
|
Mlin
|
12bcd367c7
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
6934133e0a
|
Merge pull request '花名册高级搜索BUG修复' (#133) from feature/dxf into develop
Reviewed-on: #133
|
2 years ago |
|
dxfeng
|
6e1f70ef82
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
ab44b7a08c
|
Merge pull request '花名册高级搜索BUG修复' (#132) from feature/dxf into develop
Reviewed-on: #132
|
2 years ago |
|
dxfeng
|
1d053a0437
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
dd45ac3859
|
Merge pull request '花名册高级搜索BUG修复' (#131) from feature/dxf into develop
Reviewed-on: #131
|
2 years ago |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
1987162443
|
Merge pull request '花名册高级搜索BUG修复' (#130) from feature/dxf into develop
Reviewed-on: #130
|
2 years ago |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
b10555bcdb
|
Merge pull request '花名册高级搜索BUG修复' (#129) from feature/dxf into develop
Reviewed-on: #129
|
2 years ago |
|
dxfeng
|
9dbce1e8c5
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
648cc4b3af
|
Merge pull request '花名册高级搜索BUG修复' (#128) from feature/dxf into develop
Reviewed-on: #128
|
2 years ago |
|
dxfeng
|
4ba6d5c21e
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
0a77fbe557
|
Merge pull request '花名册动态查询SQL' (#127) from feature/dxf into develop
Reviewed-on: #127
|
2 years ago |
|
dxfeng
|
9e6cc7da2a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
2 years ago |
 liang.cheng
|
1249da2b78
|
Merge pull request '花名册增加按钮' (#126) from feature/cl into develop
Reviewed-on: #126
|
2 years ago |
|
Chengliang
|
07786bc2a6
|
花名册增加按钮
|
2 years ago |
|
dxfeng
|
01c042ebbc
|
高级搜索表单完善
|
2 years ago |
|
dxfeng
|
49538d0ccb
|
Merge pull request '花名册高级搜索相关接口' (#125) from feature/dxf into develop
Reviewed-on: #125
|
2 years ago |
|
dxfeng
|
503697dd55
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
1c3b1296b5
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d1612a151a
|
花名册自定义字段展示20230106
|
2 years ago |
|
dxfeng
|
180e4a714c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d0990210e6
|
Merge pull request '花名册高级搜索相关接口' (#124) from feature/dxf into develop
Reviewed-on: #124
|
2 years ago |
|
dxfeng
|
bf577b6630
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
401a37df64
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2 years ago |
|
Mlin
|
2f505e8ca7
|
花名册自定义字段展示20230106
|
2 years ago |
|
dxfeng
|
a4dbd108b1
|
Merge pull request '花名册高级搜索相关接口' (#123) from feature/dxf into develop
Reviewed-on: #123
|
2 years ago |
