# Conflicts: # src/common/js/platform.js # src/common/js/wechatApi.js # src/index.html # src/index.tsx # src/modules/course-manage/components/AddLiveBasic.jsx # src/modules/course-manage/components/LiveCourseList.jsx # src/modules/root/App.tsx
