fix: merge conflict
This commit is contained in:
parent
6303f99b62
commit
e7b1ff2f2a
@ -2521,8 +2521,6 @@ const EditChannelModal = (props) => {
|
|||||||
'键为原状态码,值为要复写的状态码,仅影响本地判断',
|
'键为原状态码,值为要复写的状态码,仅影响本地判断',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* 字段透传控制 - OpenAI 渠道 */}
|
{/* 字段透传控制 - OpenAI 渠道 */}
|
||||||
{inputs.type === 1 && (
|
{inputs.type === 1 && (
|
||||||
@ -2593,7 +2591,8 @@ const EditChannelModal = (props) => {
|
|||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Channel Extra Settings Card */}
|
{/* Channel Extra Settings Card */}
|
||||||
<div ref={el => formSectionRefs.current.channelExtraSettings = el}>
|
<div ref={el => formSectionRefs.current.channelExtraSettings = el}>
|
||||||
@ -2699,8 +2698,6 @@ const EditChannelModal = (props) => {
|
|||||||
/>
|
/>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</Card>
|
|
||||||
</div>
|
</div>
|
||||||
</Spin>
|
</Spin>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user