# Conflicts:
#	package-lock.json
#	src/common/js/platform.js
#	src/common/js/wechatApi.js
#	src/core/wechatApi.js
#	src/index.tsx
#	src/modules/course-manage/components/CerateQWCourse.tsx
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/components/LiveCourseOpt.jsx
#	src/modules/root/App.tsx
#	src/modules/root/WechatLogin.tsx