From e7b1ff2f2a2c9b9922ef68d8131ff336be5ed65b Mon Sep 17 00:00:00 2001
From: Seefs <i@seefs.me>
Date: Thu, 2 Oct 2025 14:28:58 +0800
Subject: [PATCH] fix: merge conflict

---
 .../components/table/channels/modals/EditChannelModal.jsx  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/web/src/components/table/channels/modals/EditChannelModal.jsx b/web/src/components/table/channels/modals/EditChannelModal.jsx
index 5cff8961..09cfb0f0 100644
--- a/web/src/components/table/channels/modals/EditChannelModal.jsx
+++ b/web/src/components/table/channels/modals/EditChannelModal.jsx
@@ -2521,8 +2521,6 @@ const EditChannelModal = (props) => {
                       '键为原状态码，值为要复写的状态码，仅影响本地判断',
                     )}
                   />
-                  </Card>
-                </div>
 
                   {/* 字段透传控制 - OpenAI 渠道 */}
                   {inputs.type === 1 && (
@@ -2593,7 +2591,8 @@ const EditChannelModal = (props) => {
                       />
                     </>
                   )}
-                </Card>
+                  </Card>
+                </div>
 
                 {/* Channel Extra Settings Card */}
                 <div ref={el => formSectionRefs.current.channelExtraSettings = el}>
@@ -2699,8 +2698,6 @@ const EditChannelModal = (props) => {
                   />
                   </Card>
                 </div>
-
-                </Card>
               </div>
             </Spin>
           )}