Merge branch 'online1'

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2319,6 +2319,7 @@
             s.name_ schoole_name_,
             o.name_ organ_name_,
             CASE WHEN COUNT(sa.id_) > 0 THEN 1 ELSE 0 END isCallNames
+            case when count(ta.id_) > 0 then '1' else '0' end is_complaints_
         FROM
             course_schedule cs
             LEFT JOIN school s ON cs.schoole_id_=s.id_