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

1164 Commits

Author SHA1 Message Date
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
dxfeng 648cc4b3af Merge pull request '花名册高级搜索BUG修复' (#128) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/128
 2023-01-10 11:38:25 +08:00
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2023-01-10 11:37:28 +08:00
dxfeng 0a77fbe557 Merge pull request '花名册动态查询SQL' (#127) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/127
 2023-01-09 18:08:54 +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
liang.cheng 1249da2b78 Merge pull request '花名册增加按钮' (#126) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/126
 2023-01-09 15:13:42 +08:00
Chengliang 07786bc2a6 花名册增加按钮 2023-01-09 14:59:26 +08:00
dxfeng 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +08:00
dxfeng 49538d0ccb Merge pull request '花名册高级搜索相关接口' (#125) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/125
 2023-01-06 17:41:22 +08:00
dxfeng 503697dd55 花名册高级搜索相关接口 2023-01-06 17:40:23 +08:00
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-06 17:27:07 +08:00
Mlin d1612a151a 花名册自定义字段展示20230106 2023-01-06 17:27:02 +08:00
dxfeng 180e4a714c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 17:24:45 +08:00
dxfeng d0990210e6 Merge pull request '花名册高级搜索相关接口' (#124) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/124
 2023-01-06 17:21:12 +08:00
dxfeng bf577b6630 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 17:20:47 +08:00
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 2023-01-06 17:20:29 +08:00
Mlin 401a37df64 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
 2023-01-06 15:54:34 +08:00
Mlin 2f505e8ca7 花名册自定义字段展示20230106 2023-01-06 15:49:58 +08:00
dxfeng a4dbd108b1 Merge pull request '花名册高级搜索相关接口' (#123) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/123
 2023-01-06 15:37:51 +08:00