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

Reviewed-on: 
This commit is contained in:
weiz 2024-05-07 10:44:50 +08:00
commit d2c40275a4

@ -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()