Merge remote-tracking branch 'origin/master'

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

@@ -125,7 +125,10 @@
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_enlightenment_questionnaire
+		SELECT COUNT(*) FROM music_enlightenment_questionnaire meq
+		<include refid="queryCondition" />
+		ORDER BY meq.id_ DESC
+		<include refid="global.limit"/>
 	</select>
 
 	<select id="lockUserMusicEnlightenmentQuestionnaire" resultMap="MusicEnlightenmentQuestionnaire">