Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
# Conflicts:
# models/cloudbrain.go
# options/locale/locale_en-US.ini
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/benchmark/new.tmpl
# templates/repo/cloudbrain/inference/new.tmpl
# templates/repo/cloudbrain/new.tmpl
# templates/repo/cloudbrain/trainjob/new.tmpl
# templates/repo/grampus/trainjob/gpu/new.tmpl
# templates/repo/grampus/trainjob/npu/new.tmpl
# templates/repo/modelarts/inferencejob/new.tmpl
# templates/repo/modelarts/notebook/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
# templates/repo/modelarts/trainjob/version_new.tmpl
# web_src/js/standalone/specsuse.js
|