解决冲突

src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 19:58:01
+ * @LastEditTime : 2022-02-28 20:33:56
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -18,17 +18,27 @@ import { SupplyManagementService } from '../../services/supply-management.servic
   styleUrls: ['./tran-agreement.component.less']
 })
 export class TranAgreementComponent {
-  
+  Object: any;
   agreement:any;
   constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
     
   }
 
   ngOnInit() {
+    console.log(Object)
     const params = {
       contractType:'1',
       enterpriseInfoId: '',
-      parametersDTO: {}
+      parametersDTO: {
+        // 回单付
+        back: '',
+        // 发货地址
+        consignorAddress: '',
+        // 发货时间
+        consignorDate: '',
+        // 发货时间
+        // consignorDate: '',
+      }
     }