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

1204 Commits

Author SHA1 Message Date
Mlin 92c7c48109 汉桑组织二开 2023-02-10 13:32:31 +08:00
dxfeng a1a91b2cb8 Merge pull request '花名册，状态查询功能完善' (#150) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/150
 2023-02-06 09:51:06 +08:00
dxfeng 6ac651e8bd 花名册，状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng 0afff811c0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-03 09:51:40 +08:00
dxfeng 1cc568f738 Merge pull request '列定制BUG修复' (#149) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/149
 2023-01-17 14:54:03 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 571b0bcdfc Merge pull request '列定制BUG修复' (#148) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/148
 2023-01-17 09:31:47 +08:00
dxfeng 37ded0a19b 列定制BUG修复 2023-01-17 09:30:51 +08:00
dxfeng d68cfcee95 Merge pull request '列定制BUG修复' (#147) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/147
 2023-01-16 17:22:23 +08:00
dxfeng 8947e6da3a 列定制BUG修复 2023-01-16 17:19:59 +08:00
dxfeng d207134980 Merge pull request '列定制BUG修复' (#146) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/146
 2023-01-16 15:09:23 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
dxfeng 560c1e0336 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-14 19:03:36 +08:00
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:40:39 +08:00
Mlin 2b5acfeb32 花名册模板管理bug修复 2023-01-13 18:40:34 +08:00
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/145
 2023-01-13 18:11:57 +08:00
dxfeng d34ed2e5c6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-13 18:11:12 +08:00
dxfeng ba2909bac9 BUG修复 2023-01-13 18:10:57 +08:00
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 cd2ace5868 Merge pull request 'BUG修复' (#144) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/144
 2023-01-13 18:01:59 +08:00
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