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

# Conflicts:
#	app/controllers/application_controller.rb
#	public/react/src/AppConfig.js

public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js

@@ -493,7 +493,7 @@ export default class TPMchallengesnew extends Component {
                         <p className="color-grey-6 font-16 mb30">过关任务</p>
 
 											<TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
-																	 watch={true}  className="courseMessageMD" initValue={this.state.exercisememoMDRefval}></TPMMDEditor>
+																	 watch={true}  className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={700}></TPMMDEditor>
 
                         <p id="e_tip_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
                         <p id="e_tips_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>