Merge remote-tracking branch 'origin/master'

胡仁荣

2023-09-11 937daff0ebc1aa16a852d5a86434ab1994d8a02d

 src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java

@@ -332,7 +332,16 @@
      
      return this.findCountByComplexHql(hql.toString(), params);
   }
	

   @Override
   public List<MediaVideoLive> listvideo(String status) {

      String hql = "from MediaVideoLive where deleteFlag is false and status=?  order by createTime desc";


      return find(hql, CollectionUtils.newList(status), MediaVideoLive.class);
   }

   @Override
   public List<MediaVideoLive> listOfMine(String keyword, Integer pageNum, Integer pageSize) {