--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/videolibrary/FgVideoLibraryController.java

@@ -78,8 +78,8 @@ public class FgVideoLibraryController {
 	private Redis redis;
 
 	@ApiOperation("根据id查找视频")
-	@GetMapping("/get/{oid}")
-	public CallBack<FgVideoLibraryVO> echo(@PathVariable String oid) {
+	@GetMapping("/get/oid")
+	public CallBack<FgVideoLibraryVO> echo(String oid,String courseId) {
 		FgVideoLibraryVO vo = service.selectById(oid,true);
 		//查看促销活动，修改成活动价格
 		FgPromotionInfoOneVO info = promotionService.getInfoByResId(vo.getId(), AllResourceTypeEnum.VIDEO.getCode());
@@ -124,7 +124,7 @@ public class FgVideoLibraryController {
 		}else {
 			vo.setIsBuy(0);
 		}
-		//vo.setTimeSpeed(fgResourceManage.getSpeed(courseId, oid, AllResourceTypeEnum.VIDEO.getCode(), redis.getMemberW().getId()));
+		vo.setTimeSpeed(fgResourceManage.getSpeed(courseId, oid, AllResourceTypeEnum.VIDEO.getCode(), redis.getMemberW().getId()));
 		return CallBack.success(vo);
 	}