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

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -196,8 +196,8 @@ class Trainingjobsetting extends Component {
                                 array.push({
                                     course_group_id: result.data.group_settings[i].group_id,
                                     course_group_name: result.data.group_settings[i].group_name,
-                                    publish_time: result.data.group_settings[i].publish_time,
+                                    publish_time: moment(result.data.group_settings[i].publish_time).format('YYYY-MM-DD HH:mm'),
-                                    end_time: result.data.group_settings[i].end_time,
+                                    end_time: moment(result.data.group_settings[i].end_time).format('YYYY-MM-DD HH:mm'),
                                     publish_flag: "",
                                     end_flag: "",
                                     class_flag: "",
@@ -215,8 +215,8 @@ class Trainingjobsetting extends Component {
                         arrays.push({
                             course_group_id:result.data.group_settings[i].group_id,
                             course_group_name:result.data.group_settings[i].group_name,
-                            publish_time:result.data.group_settings[i].publish_time,
+                            publish_time:moment( result.data.group_settings[i].publish_time).format('YYYY-MM-DD HH:mm') ,
-                            end_time:result.data.group_settings[i].end_time,
+                            end_time:moment(result.data.group_settings[i].end_time ).format('YYYY-MM-DD HH:mm'),
                             course_choosed:0,
                         })
 
@@ -612,7 +612,7 @@ class Trainingjobsetting extends Component {
 						// 			item.publiend_timesh_time=""
 						// 		}
 						// 	})
-						//
+
 						let {rules}=this.state;
 						var mydatas=[];
             data = {