# Conflicts:
#	src/common/js/axios.ts
#	src/modules/college-manage/UserManagePage.tsx
#	src/modules/root/Header.jsx
#	src/modules/root/Login.jsx
#	src/modules/root/WechatLogin.tsx
#	yarn.lock