liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,483 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

1483 Commits

Author SHA1 Message Date
dxfeng 0aac4a0c57 BUG修复 2023-01-13 18:01:17 +08:00
dxfeng 26dfcf39f8 Merge pull request 'BUG修复' (#143) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/143
 2023-01-13 17:42:17 +08:00
dxfeng ec55baf5fe BUG修复 2023-01-13 17:39:52 +08:00
dxfeng e9d6a166d3 Merge pull request 'BUG修复' (#142) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/142
 2023-01-13 16:52:09 +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 52c02986c8 Merge pull request 'BUG修复' (#141) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/141
 2023-01-13 09:48:52 +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 2d456894b9 Merge pull request 'BUG修复' (#140) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/140
 2023-01-12 18:20:12 +08:00
dxfeng ebb4e88d0d BUG修复 2023-01-12 18:18:44 +08:00
dxfeng 30615f9727 Merge pull request 'BUG修复' (#139) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/139
 2023-01-12 16:50:13 +08:00
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
dxfeng bcdc52d894 Merge pull request '显示定制列穿梭框接口开发' (#138) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/138
 2023-01-12 15:47:02 +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 7d96731841 Merge pull request '显示定制列穿梭框接口开发' (#137) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/137
 2023-01-12 14:14:52 +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 70438b649a Merge pull request '显示定制列穿梭框接口开发' (#136) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/136
 2023-01-11 16:28:51 +08:00
dxfeng 0f73f6e3ac 显示定制列穿梭框接口开发 2023-01-11 16:28:19 +08:00
dxfeng 98cdb00a39 Merge pull request '显示定制列穿梭框接口开发' (#135) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/135
 2023-01-11 15:46:54 +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 2794335dc2 Merge pull request '花名册高级搜索BUG修复' (#134) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/134
 2023-01-11 14:26:55 +08:00
dxfeng 4076a755f1 花名册高级搜索BUG修复 2023-01-11 14:26:13 +08:00
Mlin 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-11 09:07:46 +08:00
dxfeng 6934133e0a Merge pull request '花名册高级搜索BUG修复' (#133) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/133
 2023-01-10 18:28:32 +08:00
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2023-01-10 18:25:53 +08:00
dxfeng ab44b7a08c Merge pull request '花名册高级搜索BUG修复' (#132) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/132
 2023-01-10 17:31:50 +08:00
dxfeng 1d053a0437 花名册高级搜索BUG修复 2023-01-10 17:31:22 +08:00
dxfeng dd45ac3859 Merge pull request '花名册高级搜索BUG修复' (#131) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/131
 2023-01-10 16:53:06 +08:00
dxfeng 832fb2b9c4 花名册高级搜索BUG修复 2023-01-10 16:52:40 +08:00
dxfeng 1987162443 Merge pull request '花名册高级搜索BUG修复' (#130) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/130
 2023-01-10 15:14:43 +08:00
dxfeng f7ce6b028a 花名册高级搜索BUG修复 2023-01-10 15:13:33 +08:00
dxfeng b10555bcdb Merge pull request '花名册高级搜索BUG修复' (#129) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/129
 2023-01-10 14:09:22 +08:00
dxfeng 9dbce1e8c5 花名册高级搜索BUG修复 2023-01-10 14:08:41 +08:00