@@ -167,13 +167,8 @@
<br />
<span style="color:red;" v-if="loginType == 'bytedance'">*重要:如存在一户多开情况,请勾选所有子账号进行授权!!!</span>
</a-form-item>
-<<<<<<< HEAD
- <!-- <a-form-item
- label="是否本代理商开户:"
-=======
- <a-form-item
- label="开户代理商:"
->>>>>>> master
+ <a-form-item
+ label="代理商开户:"
:label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
v-if="loginType == 'kuaishou'"