# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx

# Conflicts:
#	src/modules/root/Menu.tsx

This reverts commit f481a767.

# Conflicts:
#	src/common/js/axios.ts
#	src/common/js/user.ts
#	src/modules/college-manage/UserManagePage.tsx
#	src/modules/root/Login.jsx

This reverts commit f022a67e.

Feature/wufan/2010621/replace empty picture

See merge request !52

Feature/maolipeng/youhua

See merge request !51

Hotfix/zhangleyuan/20210619/storeuser

See merge request !50

Feature/pangguoming/20210622/login page modify

See merge request !49