Skip to content

fix: merge conflict #1955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seefs001 merged 1 commit into from
Oct 2, 2025
Merged

fix: merge conflict #1955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions web/src/components/table/channels/modals/EditChannelModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2521,8 +2521,6 @@ const EditChannelModal = (props) => {
'键为原状态码，值为要复写的状态码，仅影响本地判断',
)}
/>
</Card>
</div>

{/* 字段透传控制 - OpenAI 渠道 */}
{inputs.type === 1 && (
Expand Down Expand Up @@ -2593,7 +2591,8 @@ const EditChannelModal = (props) => {
/>
</>
)}
</Card>
</Card>
</div>

{/* Channel Extra Settings Card */}
<div ref={el => formSectionRefs.current.channelExtraSettings = el}>
Expand Down Expand Up @@ -2699,8 +2698,6 @@ const EditChannelModal = (props) => {
/>
</Card>
</div>

</Card>
</div>
</Spin>
)}
Expand Down