428 Commits

Author SHA1 Message Date
wulin
023876e362 修复发起考核bug 2020-10-26 14:08:21 +08:00
wulin
dd845a1ac7 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 11:56:08 +08:00
wulin
ad3eefc453 lz_flow_approval_role修改roleId为String 2020-10-26 11:56:04 +08:00
quyixiao
ca52289161 提交修改 2020-10-26 11:51:39 +08:00
quyixiao
d1957ecad6 提交修改 2020-10-26 11:51:05 +08:00
wulin
6cea3c3e7a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 11:27:21 +08:00
wulin
b2ab60cb16 修复发起考核bug 2020-10-26 11:27:15 +08:00
杜建超
2a18e0b3a8 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 11:03:52 +08:00
杜建超
cd7ae3deb0 fix 2020-10-26 11:03:34 +08:00
wulin
138a298c43 当获取节点时的开启关闭状态不对 2020-10-26 10:58:57 +08:00
wulin
9b9abc0f2e 修复保存节点小流程时没有保存关闭节点功能更 2020-10-26 10:29:33 +08:00
wulin
f1b01745cf 修复隐藏bug 2020-10-26 10:22:09 +08:00
杜建超
97a5f62a62 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 09:59:58 +08:00
杜建超
c6af248f12 fix 2020-10-26 09:59:52 +08:00
wulin
5d90b5ccfb 优化发起考核相关 2020-10-26 09:16:15 +08:00
wulin
3f4a1612ee 修复问题 2020-10-25 23:46:29 +08:00
wulin
10b076b031 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-25 22:21:27 +08:00
wulin
944846d7ec 发起考核功能基本完成 2020-10-25 22:21:22 +08:00
杜建超
8fc5e10d4d fix 2020-10-23 18:18:24 +08:00
wulin
1fe86fda4c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-23 18:12:16 +08:00
wulin
474adeb112 改的多,就不愿意描述 2020-10-23 18:12:10 +08:00
杜建超
b212baa434 fix 2020-10-23 17:56:34 +08:00
杜建超
aa7dfccc0c fix 2020-10-23 17:55:59 +08:00
wulin
6a5f7c63e4 修复无法启动问题 2020-10-23 09:07:10 +08:00
wulin
b3e7fc8d51 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 18:01:49 +08:00
wulin
d9516cee01 获取考评组信息时返回department_id 2020-10-22 18:01:44 +08:00
杜建超
246ee43638 fix 2020-10-22 17:33:48 +08:00
杜建超
88bb449061 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 17:24:12 +08:00
杜建超
36e06f47ac fix 2020-10-22 17:24:07 +08:00
wulin
a217e45b6f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 17:19:44 +08:00
wulin
838e751775 获取组模板列表是无法返回登记id 2020-10-22 17:19:39 +08:00
杜建超
378b3a062f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 17:17:19 +08:00
杜建超
51d9cfbc5b fix 2020-10-22 17:17:05 +08:00
wulin
95e45b6688 knife4j 2020-10-22 16:20:24 +08:00
杜建超
1572d6df84 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 16:16:34 +08:00
杜建超
9be0394a79 fix 2020-10-22 16:16:29 +08:00
wulin
59a8dae138 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 16:04:41 +08:00
wulin
6b6bac4899 获取节点和单个获取节点信息接口合并 2020-10-22 16:04:36 +08:00
杜建超
184b530481 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 15:47:00 +08:00
杜建超
6d1f1f1f42 fix 2020-10-22 15:46:54 +08:00
wulin
cd93891f21 获取 2020-10-22 15:06:20 +08:00
wulin
d6fd83df5d 解决冲突 2020-10-22 12:09:38 +08:00
wulin
662c38011b 修复bug 2020-10-22 12:07:31 +08:00
杜建超
4d85c2bde7 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 11:56:08 +08:00
杜建超
3c403c1d28 fix 2020-10-22 11:55:55 +08:00
wulin
91fa248be4 增加param 2020-10-22 09:51:51 +08:00
wulin
96c18e66e0 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 09:45:26 +08:00
wulin
ea176a3155 修复对判空的支持 2020-10-22 09:45:22 +08:00
杜建超
382ea51922 fix 2020-10-22 09:45:02 +08:00
wulin
2562b7c608 修复保存节点,考核指标等排序问题 2020-10-21 20:58:39 +08:00