解决冲突

src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 20:32:44
+ * @LastEditTime : 2022-03-01 13:42:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -89,6 +89,7 @@
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>
@@ -141,6 +142,7 @@
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
                     name="unloadAddress{{ idx }}"
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>