Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -136,6 +136,17 @@ public class StudentRegistration {
     @ApiModelProperty(value = "是否不需要云教练 0-需要 1-不需要",required = true)
     private Integer noneNeedCloudTeacher = 0;
 
+    @ApiModelProperty(value = "会员截止时间",required = true)
+    private Date membershipEndTime;
+
+    public Date getMembershipEndTime() {
+        return membershipEndTime;
+    }
+
+    public void setMembershipEndTime(Date membershipEndTime) {
+        this.membershipEndTime = membershipEndTime;
+    }
+
     public String getCertificateType() {
         return certificateType;
     }

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

@@ -48,6 +48,7 @@
         <result column="paying_status_" property="payingStatus"/>
         <result column="has_cloud_teacher_" property="hasCloudTeacher"/>
         <result column="none_need_cloud_teacher_" property="noneNeedCloudTeacher"/>
+        <result column="membership_end_time_" property="membershipEndTime"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentMusicGroupDto" id="StudentMusicGroupDto"
@@ -1036,9 +1037,10 @@
     </select>
 
     <select id="getMusicGroupStu" resultMap="StudentRegistration">
-        SELECT sr.user_id_, s.username_ name_, sr.music_group_status_
+        SELECT sr.user_id_, s.username_ name_, sr.music_group_status_,st.membership_end_time_
         FROM student_registration sr
         LEFT JOIN sys_user s on sr.user_id_ = s.id_
+        LEFT JOIN student st on st.user_id_ = s.id_
         WHERE music_group_id_ = #{musicGroupId}
     </select>