From 116d070bbf0c196d5b13d9333a54269cfc70fa09 Mon Sep 17 00:00:00 2001
From: DD <1083962986@qq.com>
Date: Wed, 10 Sep 2025 18:37:55 +0800
Subject: [PATCH] merge

---
 constant/channel.go        | 6 ++----
 web/src/helpers/render.jsx | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/constant/channel.go b/constant/channel.go
index 0cfd90cd..34fb20f4 100644
--- a/constant/channel.go
+++ b/constant/channel.go
@@ -49,13 +49,11 @@ const (
 	ChannelTypeCoze           = 49
 	ChannelTypeKling          = 50
 	ChannelTypeJimeng         = 51
-<<<<<<< HEAD
-	ChannelTypeSubmodel       = 52
-=======
 	ChannelTypeVidu           = 52
->>>>>>> 041782c49e0289b9d2e64a318e81e4f75754dabf
+	ChannelTypeSubmodel       = 53
 	ChannelTypeDummy          // this one is only for count, do not add any channel after this
 
+
 )
 
 var ChannelBaseURLs = []string{
diff --git a/web/src/helpers/render.jsx b/web/src/helpers/render.jsx
index 49e87f66..676a582b 100644
--- a/web/src/helpers/render.jsx
+++ b/web/src/helpers/render.jsx
@@ -342,7 +342,7 @@ export function getChannelIcon(channelType) {
       return <FastGPT.Color size={iconSize} />;
     case 21: // 知识库：AI Proxy
     case 44: // 嵌入模型：MokaAI M3E
-    case 52: // SubModel
+    case 53: // SubModel
       return null;
     default:
       return null; // 未知类型或自定义渠道不显示图标