448 Commits

Author SHA1 Message Date
杜建超
50915b9f6b fix 2020-12-09 16:03:40 +08:00
杜建超
1973ad96ca fix 2020-12-09 15:49:40 +08:00
wulin
54113f4869 增加detail 2020-12-09 14:37:45 +08:00
wulin
de90f8b10a 解决冲突 2020-12-09 14:26:33 +08:00
wulin
367db0a8f8 增加排序字段 2020-12-09 14:25:58 +08:00
杜建超
9dc42c3414 fix 2020-12-09 14:22:55 +08:00
杜建超
bd6f92ee76 fix 2020-12-09 10:55:38 +08:00
杜建超
2bba48672c fix 2020-12-08 18:43:41 +08:00
quyixiao
ff06c7537d 提交个民tgit pull 2020-12-08 18:22:29 +08:00
quyixiao
c6cf46407a 提交修改 2020-12-08 18:22:11 +08:00
wulin
eced4b0bfa 修改数据库字段名称 2020-12-08 14:45:44 +08:00
wulin
f2fb785423 新增修改 2020-12-07 15:45:29 +08:00
wulin
3717d59286 修改测试 2020-12-07 14:51:48 +08:00
wulin
d23a9536f3 提交测试 2020-12-07 14:01:59 +08:00
wulin
aaef062ec8 解决重估他 2020-12-07 11:55:03 +08:00
wulin
9ad3d87eee 完善修改绩效详情接口 2020-12-07 11:54:23 +08:00
杜建超
4b45430b95 fix 2020-12-07 10:59:53 +08:00
杜建超
a3901bed96 fix 2020-12-04 14:23:13 +08:00
wulin
b2806dc028 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-03 16:55:27 +08:00
wulin
7685db0d7a resultScore 和resultDetail增加字段 2020-12-03 16:55:22 +08:00
quyixiao
4e2976fe54 提交修改 2020-12-03 16:52:47 +08:00
wulin
923268ea97 解决bug 2020-12-03 14:18:09 +08:00
wulin
f7330346db 增加权倾标志 2020-12-03 14:17:19 +08:00
quyixiao
b12a01e820 提交修改 2020-12-03 14:16:37 +08:00
quyixiao
3e14c8a254 提交修改 2020-12-03 12:40:07 +08:00
杜建超
1d1ea48651 fix 2020-12-02 16:48:12 +08:00
杜建超
4d137dda1a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-02 15:56:24 +08:00
杜建超
36036f61f1 fix 2020-12-02 15:56:19 +08:00
wulin
34524d4680 提交线上测试催办接口 2020-12-02 11:41:20 +08:00
杜建超
f511a807e9 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-01 18:16:10 +08:00
杜建超
4aa65d3468 fix 2020-12-01 18:16:05 +08:00
wulin
65f1023f0f 获取组列表改成倒叙 2020-12-01 14:25:23 +08:00
wulin
464ebae862 考评组详情为过滤is_delete=1得职位信息 2020-12-01 14:12:38 +08:00
杜建超
cccaab298a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-01 13:57:19 +08:00
杜建超
65753426df fix 2020-12-01 13:56:39 +08:00
wulin
55edce98fd 组排序按照倒序排列 2020-12-01 10:11:56 +08:00
wulin
587400fb28 swagger线上禁用 2020-11-27 14:21:25 +08:00
wulin
23a78f0756 swagger是否生成文档改成配置文件 2020-11-27 14:17:54 +08:00
wulin
11eed02309 修复bug 2020-11-26 18:10:18 +08:00
wulin
90fd42b7f6 后台获取员工接口优化 2020-11-26 18:04:23 +08:00
wulin
719fd8086c 优化钉钉通讯录同步方法,更新钉钉V2版本,修复部分其他bug 2020-11-26 17:35:54 +08:00
wulin
b9f9a2d125 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-25 09:32:00 +08:00
wulin
2c47896f3e 修复钉钉同步时没有删除已经去掉的部门,同时获取部门属性列表时没有过滤删除的部门 2020-11-25 09:31:56 +08:00
杜建超
6540811216 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-24 11:54:57 +08:00
杜建超
3b6425c6c9 fix 2020-11-24 11:54:52 +08:00
wulin
5f128805c6 是否验证短信验证码配置到配置我呢见 2020-11-24 09:19:25 +08:00
quyixiao
0b6ba66212 提交修改 2020-11-23 18:08:42 +08:00
wulin
d15db7a932 取消上一步bug 2020-11-23 16:35:13 +08:00
quyixiao
533f18282f 提交修改 2020-11-23 14:43:38 +08:00
杜建超
79d36ae7b8 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-23 11:01:49 +08:00