Merge pull request '提货点列表新增详细地址' (#2) from dev into master

Reviewed-on: https://gitea.lihaink.cn/mkm/erp/pulls/2

app/api/lists/merchant/MerchantLists.php

@@ -53,7 +53,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
                 ) ASC ");
         }
         return Merchant::where($this->searchWhere)
-            ->field('mer_id,mer_name,long,lat,service_phone')
+            ->field('mer_id,mer_name,long,lat,service_phone,mer_address')
             ->limit($this->limitOffset, $this->limitLength)
             ->order($order)
             ->select()