合并冲突
Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
diff --git a/src/pages/User/Login/index.tsx b/src/pages/User/Login/index.tsx
index 585f97b..e29032e 100644
--- a/src/pages/User/Login/index.tsx
+++ b/src/pages/User/Login/index.tsx
@@ -85,7 +85,7 @@
};
const Login: React.FC = () => {
- const [userLoginState, setUserLoginState] = useState<API.LoginResult>({code: 200});
+ const [userLoginState, setUserLoginState] = useState<API.LoginResult>({ code: 200 });
const [type, setType] = useState<string>('account');
const { initialState, setInitialState } = useModel('@@initialState');
const [captchaCode, setCaptchaCode] = useState<string>('');
@@ -255,7 +255,7 @@
}
subTitle={
<span style={{ color: '#b3c7f9', fontSize: 16 }}>
- 探索你的专属星球，畅享PT世界
+ 探索你的专属星球，畅享PT世界 JRX MSY ZYT HXQ LJB
</span>
}
initialValues={{
@@ -509,7 +509,7 @@
color: '#fff',
fontSize: 14,
}}>
- <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
+ <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
</a>
</ProFormCheckbox>
<a