Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -146,6 +146,7 @@
 		FROM live_goods_mapper lgm
 		LEFT JOIN live_goods lg ON lgm.goods_id_ = lg.id_
 		<include refid="queryGoodsPageSql"/>
+		ORDER BY lgm.update_time_ DESC
 	</select>
 	<select id="countLiveGoods" resultType="java.lang.Integer">
 		SELECT COUNT(lgm.id_) FROM live_goods_mapper lgm

mec-im/src/main/java/com/ym/service/Impl/LiveRoomServiceImpl.java

@@ -172,8 +172,8 @@ public class LiveRoomServiceImpl implements LiveRoomService {
                         //保存切片
                         ImLiveRoomVideo imLiveRoomVideo = initImLiveRoomVideo(roomId, recordNotify.getRecordId(), now);
                         imLiveRoomVideo.setStartTime(video.getEndTime());
-                        video.setUrl(fileUrl);
-                        video.setType(2);
+                        imLiveRoomVideo.setUrl(fileUrl);
+                        imLiveRoomVideo.setType(2);
                         imLiveRoomVideoService.save(imLiveRoomVideo);
                         return;
                     }else {