Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm

# Conflicts:
#	public/react/public/css/iconfont.css
#	public/react/src/common/components/media/AliyunUploader.js
#	public/react/src/common/educoder.js
#	public/react/src/modules/user/usersInfo/Infos.js
#	public/react/src/modules/user/usersInfo/video/InfosVideo.js
#	public/react/src/modules/user/usersInfo/video/VideoPublishSuccess.js
#	public/react/src/modules/user/usersInfo/video/VideoUploadList.js

public/react/src/common/educoder.js

@@ -65,4 +65,3 @@ export { default as ImageLayerHook } from './hooks/ImageLayerHook'
 export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'
 export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/CNotificationHOC'
 export { default as ModalWrapper } from '../modules/courses/common/ModalWrapper'
-

public/react/src/modules/user/usersInfo/Infos.js

@@ -239,7 +239,6 @@ class Infos extends Component{
         {
           isRenders && <Trialapplication {...this.props} {...this.state} Cancel={() => this.cancelModulationModels()}/>
         }
-        
         <InfosBanner 
         {...this.props} 
         {...this.state}