Merge remote-tracking branch 'upstream/main'

web/src/constants/channel.constants.js

@@ -36,13 +36,6 @@ export const CHANNEL_OPTIONS = [
     color: 'teal',
     label: 'Azure OpenAI',
   },
-  {
-    key: 11,
-    text: 'Google PaLM2',
-    value: 11,
-    color: 'orange',
-    label: 'Google PaLM2',
-  },
   {
     key: 24,
     text: 'Google Gemini',
@@ -92,10 +85,18 @@ export const CHANNEL_OPTIONS = [
     color: 'purple',
     label: '智谱 GLM-4V',
   },
+  {
+    key: 11,
+    text: 'Google PaLM2',
+    value: 11,
+    color: 'orange',
+    label: 'Google PaLM2',
+  },
   { key: 25, text: 'Moonshot', value: 25, color: 'green', label: 'Moonshot' },
   { key: 19, text: '360 智脑', value: 19, color: 'blue', label: '360 智脑' },
   { key: 23, text: '腾讯混元', value: 23, color: 'teal', label: '腾讯混元' },
   { key: 31, text: '零一万物', value: 31, color: 'green', label: '零一万物' },
+  { key: 35, text: 'MiniMax', value: 35, color: 'green', label: 'MiniMax' },
   { key: 8, text: '自定义渠道', value: 8, color: 'pink', label: '自定义渠道' },
   {
     key: 22,

web/src/pages/Setting/Operation/SettingsMagnification.js

@@ -135,7 +135,7 @@ export default function SettingsMagnification(props) {
             <Row gutter={16}>
               <Col span={16}>
                 <Form.TextArea
-                  label={'模型补全倍率'}
+                  label={'模型补全倍率（仅对自定义模型有效）'}
                   extraText={'仅对自定义模型有效'}
                   placeholder={'为一个 JSON 文本，键为模型名称，值为倍率'}
                   field={'CompletionRatio'}