解决冲突

src/app/routes/partner/rebate-management/services/rebate-management.service.ts

@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RebateManagementService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}