From b93dd9470c2470d14e8850c46033d1d964e07405 Mon Sep 17 00:00:00 2001
From: yys <47@gamerwa.com>
Date: Wed, 15 Apr 2026 14:06:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-ui/src/views/ai/order/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin-ui/src/views/ai/order/index.vue b/admin-ui/src/views/ai/order/index.vue
index 6c386b2..33c7281 100644
--- a/admin-ui/src/views/ai/order/index.vue
+++ b/admin-ui/src/views/ai/order/index.vue
@@ -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();