Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 src/app/routes/map/coordinates-picker/coordinates-picker.component.html

@@ -10,7 +10,7 @@
                        </nz-input>
                    </div>
                    <div nz-col [nzSpan]="1">
                        <button nz-button [nzType]="'primary'" [disabled]="disabled"  (click)="mapSearch($event)" class="mr-sm">
                        <button nz-button [nzType]="'primary'"  (click)="mapSearch($event)" class="mr-sm">
                            <i class="anticon anticon-search"></i><span>搜索</span>
                        </button>
                    </div>