解决冲突

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html

@@ -30,6 +30,7 @@
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>
@@ -80,6 +81,7 @@
                     (click)="openMap('end', idx)"
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html

@@ -37,6 +37,7 @@
                     name="startDetailedAddress{{ idx }}"
                     placeholder="请输入装货地"
                     required
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>
@@ -90,6 +91,7 @@
                     name="endDetailedAddress{{ idx }}"
                     placeholder="请输入卸货地"
                     required
+                    readonly="true"
                   />
                 </nz-input-group>
               </div>