# Conflicts:
#   src/views/Project/ProjectWorkbench/workbenchList/index.tsx

Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/sunyihao/bkunyun into feat-20220705-customTemplate

cn-Update index.tsx

See merge request !96

Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/sunyihao/bkunyun into feat-20220705-customTemplate

fix: 解决任务详情删除终止权限bug cn-

See merge request !95

cn-fix: 新增模板勾选、文件路径修改

See merge request !94

cn-fix: 提交作业流程图的通过状态初始化

See merge request !93

cn-feat: 参数设置部分样式完成， 切换产品时产品id修改， 算子版本字段修改

See merge request !92

Feat 20220705 custom template merge release cn-

See merge request !91

Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/sunyihao/bkunyun into feat-20220705-customTemplate

fix: batch运行状态样式修改

See merge request !90

fix: batch运行完成状态显示

See merge request !89

fix: 版本字段修改

See merge request !88