314 Commits

Author SHA1 Message Date
quyixiao
7f89d1c4af 提交修改 2020-11-03 11:59:37 +08:00
杜建超
1bc0cc2495 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-02 18:16:24 +08:00
杜建超
3e6332791e fix 2020-11-02 18:16:19 +08:00
quyixiao
225e07be09 提交修改 2020-11-02 17:30:34 +08:00
quyixiao
2459d85638 提交修改 2020-11-02 17:28:51 +08:00
杜建超
d9a67cbd99 fix 2020-11-02 16:18:48 +08:00
quyixiao
2a73677ea1 提交修改 2020-11-02 12:02:36 +08:00
quyixiao
387a17c62f 提交修改 2020-11-02 12:02:03 +08:00
杜建超
1781c3fdcb fix 2020-11-02 10:34:20 +08:00
杜建超
de859ed647 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 18:20:43 +08:00
杜建超
929a439b89 fix 2020-10-30 18:20:38 +08:00
quyixiao
76e4779f89 提交修改 2020-10-30 17:05:10 +08:00
quyixiao
00f05d3cab 提交修改 2020-10-30 17:04:45 +08:00
杜建超
e077ea54a3 add log 2020-10-30 15:37:37 +08:00
杜建超
6b53b91544 fix 2020-10-30 14:23:14 +08:00
杜建超
abd2eaa80c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 14:11:25 +08:00
wulin
60017b524e 解决bug 2020-10-30 11:54:00 +08:00
wulin
c88eb0a9b3 发起绩效时增加搜索绩效管理员 2020-10-30 11:30:20 +08:00
wulin
ee7c9ebc4f 修复问题 2020-10-30 11:12:34 +08:00
杜建超
b1ef88c49e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 10:50:00 +08:00
杜建超
d96c2d2cdb fix 2020-10-30 10:49:53 +08:00
wulin
e5b21bde35 保存组接口增加对组管理员表lz_staff_role数据的插入 2020-10-30 09:54:58 +08:00
杜建超
53ab4efa73 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 09:27:43 +08:00
杜建超
d8a4bf513a fix 2020-10-30 09:27:38 +08:00
wulin
75e1c2ea2b lz_evaluation_start_staff增加department_id 2020-10-30 09:26:48 +08:00
wulin
f8fc1d16c3 获取详情保存详情增加评分详细记录 2020-10-29 19:33:47 +08:00
wulin
b92dfdb974 保存节点的时候增加必备权限的复制 2020-10-29 15:07:16 +08:00
杜建超
72c50b6272 fix 2020-10-28 18:02:53 +08:00
杜建超
cfe61f1a58 fix 2020-10-28 17:48:24 +08:00
wulin
8587ce74fe Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 11:24:24 +08:00
wulin
f35c7c6df6 chart表添加描述字段 2020-10-28 11:24:19 +08:00
杜建超
2b2ab2ff07 fix 2020-10-28 11:06:32 +08:00
杜建超
7546eb5ef4 task test 2020-10-28 10:48:24 +08:00
wulin
984167cee0 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 17:12:07 +08:00
wulin
15c82ace3a 增加保存绩效详情接口 2020-10-27 17:12:03 +08:00
杜建超
3e496962b1 fix 2020-10-27 17:04:15 +08:00
杜建超
82bfc20cd4 fiz 2020-10-27 16:45:40 +08:00
杜建超
5a9e697deb fix 2020-10-27 16:21:25 +08:00
杜建超
1206daa643 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:20:16 +08:00
杜建超
0df78fc7a3 fix 2020-10-27 16:20:12 +08:00
wulin
64efab57b9 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:08:38 +08:00
wulin
0d33e10774 添加获取绩效详情 2020-10-27 16:08:33 +08:00
杜建超
fcf9ec460b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 15:56:07 +08:00
杜建超
4f3a52596f fix 2020-10-27 15:56:03 +08:00
wulin
c8c492e9ad 解决冲突 2020-10-27 14:55:46 +08:00
wulin
b95bb856d1 发起考核时返回发起对象 2020-10-27 14:54:58 +08:00
quyixiao
162c01b73b 提交修改 2020-10-27 14:34:37 +08:00
quyixiao
4a27bc2692 提交修改 2020-10-27 14:34:10 +08:00
wulin
31eec17e0e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 12:05:23 +08:00
quyixiao
1880e48eab 提交修改 2020-10-27 11:49:08 +08:00