Merge branch 'master' into river

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -84,7 +84,7 @@
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>家长姓名 ：${studentInfo.parentsName!}</span>
+                    <span>家长姓名 ：${studentInfo.realName!}</span>
                     <span>电话： ${studentInfo.phone!}</span>
                 </div>
                 <div class="iInfo">

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -83,7 +83,7 @@
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>家长姓名： ${studentInfo.parentsName!}</span>
+                    <span>家长姓名： ${studentInfo.realName!}</span>
                     <span>电话： ${studentInfo.phone!}</span>
                 </div>
                 <div class="iInfo">

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

@@ -793,7 +793,7 @@
     </update>
 
     <select id="findClassGroupByType" resultMap="ClassGroupTeachers">
-        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId} AND group_type = 'MUSIC'
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId} AND group_type_ = 'MUSIC'
         <if test="type !=null ">
             AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>