merge

2026-04-19 09:08:38 +00:00 · 2025-09-10 18:37:55 +08:00
parent 42d29756a0
commit 78b0f8905b
2 changed files with 3 additions and 5 deletions
--- 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{