Merge remote-tracking branch 'origin/feature/1019-tenant' into feature/1019-tenant

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -404,9 +404,15 @@
 		<include refid="global.limit"/>
 	</select>
 	<select id="countWeChatStudentTrainData" resultType="java.lang.Integer">
-		select COUNT(c.user_id_) from
+		select COUNT(st.user_id_) from
 		(
-		select st.user_id_
+		select st.user_id_                                                 userId,
+		su.avatar_                                             avatar,
+		su.username_                                           username,
+		GROUP_CONCAT(DISTINCT sb.name_)                        subjectName,
+		SUM(mprs.playTime) / 60                                trainTimes,
+		COUNT(DISTINCT mprs.create_time_)                      trainDays,
+		SUM(mprs.playTime) / 60 / COUNT(DISTINCT mprs.create_time_) avgTrainTimes
 		from student st
 		left join
 		(select smcr.user_id_,