Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursesGroupServiceImpl.java

@@ -157,7 +157,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             courseName = courseName.substring(0,courseName.indexOf("("));
             String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
             courseTime = courseTime.substring(0, courseTime.indexOf("至"));
-            errMessage="现在课程：xxx";
+            errMessage="现在课程：";
             errMessage+=courseName;
             errMessage+="<br/>冲突时间：";
             errMessage+=courseTime;
@@ -627,7 +627,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             courseName = courseName.substring(0,courseName.indexOf("("));
             String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
             courseTime = courseTime.substring(0, courseTime.indexOf("至"));
-            errMessage="现在课程：xxx";
+            errMessage="现在课程：";
             errMessage+=courseName;
             errMessage+="<br/>冲突时间：";
             errMessage+=courseTime;