Merge branch 'feature_HW_20230331' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -72,7 +72,7 @@
         <result property="userId" column="user_id_"/>
         <result property="phone" column="phone_"/>
         <result property="username" column="username_"/>
-        <result property="trainingScore" column="training_score_1"/>
+        <result property="trainingScore" column="trainingScore"/>
         <result property="trainingTime" column="training_time_"/>
         <collection property="detailDtos" ofType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto1">
             <result property="standardScore" column="standard_score_"/>
@@ -84,7 +84,7 @@
         </collection>
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
-        select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_1,
+        select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_ trainingScore,
                sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,
                sled.avg_score_,sled.heard_level_,sle.training_time_
         from student_lesson_examination sle