Merge branch 'dev_1_3_2_20220815' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -163,7 +163,6 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
 
         VideoLessonGroupSearch query = new VideoLessonGroupSearch();
         //筛选已审核的视频课
-        query.setAuditStatus(AuthStatusEnum.PASS.getCode());
         query.setGroupId(groupId);
         List<VideoLessonGroupVo> lessonGroup = videoLessonGroupDao.selectPage(null, query);
         if (lessonGroup.isEmpty()){

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

@@ -109,7 +109,6 @@
 			<if test="shelvesTime !=null">shelves_time_ = #{shelvesTime},</if>
 			<if test="shelvesReason !=null and shelvesReason!=''">shelves_reason_ = #{shelvesReason},</if>
 			<if test="shelvesId !=null">shelves_id_ = #{shelvesId},</if>
-		    <if test="shelvesFlag != null and shelvesFlag == 0">audit_status_ = 'DOING',audit_name_ = null,audit_id_ = null,</if>
 			update_time_ = SYSDATE()
 		</set>
 		WHERE id_ = #{id}