From 9a9e547fad4cc5ee333bcc29edb6b72326e3041f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 17:36:17 +0800
Subject: [PATCH] Merge branch 'dev_aliyun' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/message/js/MessagSub.js
---
 .../react/src/modules/message/js/Messagerouting.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js
index c9806445c..a4d7fd6f9 100644
--- a/public/react/src/modules/message/js/Messagerouting.js
+++ b/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() {