404 Commits

Author SHA1 Message Date
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
wulin
c5b51dd21e Fix 2020-10-21 20:53:42 +08:00
wulin
b9397343c9 解决冲突 2020-10-21 20:51:12 +08:00
wulin
cadab4891a 新增保存戒掉小流程列表,修改保存考核指标为列表 2020-10-21 20:50:22 +08:00
杜建超
e06eedb62e fix 2020-10-21 18:13:27 +08:00
杜建超
ed4f1e3736 fix 2020-10-21 18:12:15 +08:00
杜建超
35afe09d7a fix 2020-10-21 17:05:43 +08:00
杜建超
6e73c4da7d fix 2020-10-21 17:04:56 +08:00
wulin
4d086ba27c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 16:23:14 +08:00
wulin
ddf11e0134 流程小节点增加权重
"
2020-10-21 16:23:07 +08:00
杜建超
9d34f16065 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 16:00:50 +08:00
杜建超
212acf1388 fix 2020-10-21 16:00:44 +08:00
quyixiao
c736fb0f2d 提交修改 2020-10-21 14:36:09 +08:00
quyixiao
fc92bb2557 抢晒镜修改 2020-10-21 14:35:43 +08:00
wulin
d5396323fd 解决问题 2020-10-21 14:35:36 +08:00
quyixiao
9e1a5c591b 提交修改 2020-10-21 14:35:25 +08:00
wulin
4ea78046df Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 14:31:03 +08:00
wulin
379cb16def 考核组相关的保存和编辑接口合并 2020-10-21 14:30:58 +08:00
quyixiao
bbde768178 提交修改 2020-10-21 14:20:10 +08:00
quyixiao
03c55402bc 提交修改 2020-10-21 11:49:27 +08:00
quyixiao
79777b07fa 提交修改 2020-10-21 11:28:00 +08:00
杜建超
cfdc86c01e fix 2020-10-21 11:17:42 +08:00
杜建超
4e89c24e49 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 11:16:14 +08:00
杜建超
53ed800463 fix 2020-10-21 11:16:08 +08:00
quyixiao
9177eab432 rjuq whnt 2020-10-21 11:12:12 +08:00