合并分支

src/app/my/my.service.ts

@@ -20,10 +20,10 @@ export class MyService {
   }
 
   //  文件下载
-  filePath(itemType, itemId, fileCategory, code, mdDropOptionCode,customerId=null) {
+  filePath(itemType, itemId, fileCategory, code, mdDropOptionCode,customerId=null,learningStatus=null,fileId=null) {
     const url = this.API + '/filePathQuery';
     return this.http
-      .post(url, JSON.stringify({ itemType: itemType, itemId: itemId, fileCategory: fileCategory, code: code, mdDropOptionCode: mdDropOptionCode,customerId:customerId }));
+      .post(url, JSON.stringify({ itemType: itemType, itemId: itemId, fileCategory: fileCategory, code: code, mdDropOptionCode: mdDropOptionCode,customerId:customerId}));
   }
 
   //  重要公告
@@ -900,8 +900,6 @@ export class MyService {
     const url = this.API + "/videoPlay/queryVideoPlayback";
     return this.http.post(url,JSON.stringify(params))
   }
-<<<<<<< HEAD
-=======
 
   // 讲师信息查询
   lecturerQuery(params){
@@ -951,5 +949,4 @@ export class MyService {
     return this.http.post(url,JSON.stringify(params))
   }
   
->>>>>>> 338ece1... 动态公告佣金显示
 }