解决冲突

src/app/routes/contract-management/services/contract-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-04 21:05:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:17:10
+ * @LastEditTime : 2022-02-24 10:00:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\services\\contract-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -31,6 +31,8 @@ export class ContractManagementService extends BaseService {
   $api_listDetailed_page = `/api/sdc/contract/listDetailed/page`;
   // 查询框架合同
   $api_listFrame_page = `/api/sdc/contract/listFrame/page`;
+  // 查询合伙人合同
+  $api_listPartner_page = `/api/sdc/contract/listPartner/page`;
   // 获取订单合同表
   $api_contract_get = `/api/sdc/contract/get`;
   constructor(public injector: Injector) {