解决冲突

src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts

@@ -49,7 +49,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
  */
   get reqParams() {
     return {
-      templateType: 'MX',
+      templateType: 'kj',
       ...this.sf?.value,
     };
   }

src/app/routes/contract-management/components/contract-template/contract-template.component.ts

@@ -49,7 +49,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
  */
   get reqParams() {
     return {
-      templateType: 'KJ',
+      templateType: 'MX',
       ...this.sf?.value,
     };
   }