Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockApplyVo.java

@@ -189,4 +189,9 @@ public class MockApplyVo {
 	@ApiModelProperty("直播状态 0直播中 1未开播 2回放中 3已结束")
 	private Integer liveStatus;
 
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -409,7 +409,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN major m ON g.major_id = m.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
-        LEFT JOIN
         where 1=1
         and cgu.`status` =1
         <if test="gradeId != null and gradeId !='' ">

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
         <result property="recordingUrl" column="recording_url"/>
+        <result property="coverUrl" column="cover_url"/>
     </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
@@ -187,7 +188,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.live_url,
             cs.live_start_time,
             cs.live_end_time,
-            cs.recording_url
+            cs.recording_url,
+            cs.cover_url
         FROM
             mock_apply ma
         LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id