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

# Conflicts:
#	public/react/src/modules/message/js/MessagSub.js

public/react/src/modules/message/js/Messagerouting.js

@@ -156,14 +156,24 @@ class Messagerouting extends Component{
 		// console.log(child);
 		// // console.log(this.refs.childModel);
 		// console.log(child);
-		// child.getdatas();
+		try {
+			child.getdatas();
+		}catch (e) {
+
+		}
+
 		//
 	}
 	homeworkendss2(child){
 		// console.log(child);
 		// // console.log(this.refs.childModel);
 		// console.log(child);
-		// child.getdatas2();
+		try {
+			child.getdatas2();
+		}catch (e) {
+
+		}
+
 		//
 	}
 	render() {