src/modules/root · f7f0403af429a56ba6af4bb4285a5b1deae6d35c · xiaomai-cloud-class / xiaomai-cloud-class-web

Merge branch 'feature/zhujian/0726/qwLiving' into dev · e723d3fe

# Conflicts:
#	src/common/js/wechatApi.js
#	src/index.html
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/root/App.tsx
#	src/modules/root/CollegeManagePage.jsx
#	src/modules/root/Header.jsx
#	src/routes/config/mainRoutes.tsx

committed Aug 12, 2021

e723d3fe

Name	Last commit	Last Update
..
App.tsx		Loading commit data...
AppContent.tsx		Loading commit data...
CollegeManagePage.jsx		Loading commit data...
CollegeManagePage.less		Loading commit data...
CreateCollege.jsx		Loading commit data...
CreateCollege.less		Loading commit data...
ErrorCollege.jsx		Loading commit data...
ErrorCollege.less		Loading commit data...
Header.jsx		Loading commit data...
Header.less		Loading commit data...
Login.jsx		Loading commit data...
Login.less		Loading commit data...
Main.jsx		Loading commit data...
Main.less		Loading commit data...
Menu.less		Loading commit data...
Menu.tsx		Loading commit data...
SwitchRoute.tsx		Loading commit data...
WechatLogin.less		Loading commit data...
WechatLogin.tsx		Loading commit data...