fix: 解决合并冲突

This commit is contained in:
yys 2026-04-15 14:06:01 +08:00
parent a26021dc1c
commit b93dd9470c
1 changed files with 0 additions and 3 deletions

View File

@ -340,8 +340,6 @@ export default {
const value = String(str || "").trim();
return /^https?:\/\//i.test(value);
},
<<<<<<< HEAD
=======
/** 已知错误码对应中文说明(与门户 VideoGen 一致) */
volcTaskErrorHintForCode(code) {
const c = String(code || "").trim();
@ -390,7 +388,6 @@ export default {
}
return null;
},
>>>>>>> seedance_score
// portal-ui GeneratedAssets
isImage(url) {
const value = String(url || "").trim();