150 Commits

Author SHA1 Message Date
杜建超
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
d8af83e0fb 提交修改 2020-10-27 11:48:32 +08:00
wulin
4d33a7fe35 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 11:13:19 +08:00
wulin
daad5e41f6 修改发起考核接口, 2020-10-27 11:13:13 +08:00
quyixiao
41e6a8a7c7 提交修改 2020-10-26 18:52:53 +08:00
quyixiao
1217c67b32 提交儿童睡袋 t 2020-10-26 18:52:11 +08:00
杜建超
2f519074d3 fix 2020-10-26 16:19:52 +08:00
杜建超
4681cb93fb fix 2020-10-26 16:19:25 +08:00
quyixiao
d90ea0b15a 提交修改 2020-10-26 16:01:20 +08:00
quyixiao
4aa5aa4dd4 提交修改 2020-10-26 15:37:58 +08:00
quyixiao
fb945d20a9 提交修改 2020-10-26 15:36:20 +08:00
wulin
5c896280de flowchart添加字段 2020-10-26 15:35:39 +08:00
quyixiao
ca52289161 提交修改 2020-10-26 11:51:39 +08:00
quyixiao
d1957ecad6 提交修改 2020-10-26 11:51:05 +08:00
wulin
9b9abc0f2e 修复保存节点小流程时没有保存关闭节点功能更 2020-10-26 10:29:33 +08:00
wulin
3f4a1612ee 修复问题 2020-10-25 23:46:29 +08:00
wulin
944846d7ec 发起考核功能基本完成 2020-10-25 22:21:22 +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
d9516cee01 获取考评组信息时返回department_id 2020-10-22 18:01:44 +08:00
wulin
838e751775 获取组模板列表是无法返回登记id 2020-10-22 17:19:39 +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
ea176a3155 修复对判空的支持 2020-10-22 09:45:22 +08:00
wulin
b9397343c9 解决冲突 2020-10-21 20:51:12 +08:00
wulin
cadab4891a 新增保存戒掉小流程列表,修改保存考核指标为列表 2020-10-21 20:50:22 +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
ddf11e0134 流程小节点增加权重
"
2020-10-21 16:23:07 +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
03c55402bc 提交修改 2020-10-21 11:49:27 +08:00
quyixiao
9177eab432 rjuq whnt 2020-10-21 11:12:12 +08:00
wulin
302d4c744c 考核组列表返回考核人数 2020-10-21 10:27:49 +08:00
wulin
cec8d658ce 查询部门增加code 2020-10-20 16:08:00 +08:00
wulin
be1b6d3610 增加获取考核组详情接口 2020-10-20 11:06:25 +08:00