Merge branch 'zx_saas_shortUrl' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -695,6 +695,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         params.put("versionTag","v2");
+		params.put("offset", pageInfo.getOffset());
 
          int count = courseScheduleDao.countTeacherServeHomeworkDetailV2(params, courseIds);
          if (count == 0) {

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

@@ -4403,7 +4403,7 @@
         from course_schedule cs
         left join course_homework ch on cs.id_ = ch.course_schedule_id_
         <include refid="selectPage"/>
-        <include refid="global.limit"></include>
+        <include refid="global.limit"/>
     </select>
 
     <select id="countTeacherServeHomeworkDetailV2" resultType="int">