Authored by 毕凯

Merge branch 'release/4.5' of git.dev.yoho.cn:web/yohobuywap into release/4.5

This diff could not be displayed because it is too large.
... ... @@ -586,7 +586,7 @@ class UserModel
$result = array();
// 调用接口获取地址数据
$address = UserData::addressData($uid);
$address = UserData::addressTextData($uid);
// 处理地址数据
if (isset($address['data']) && !empty($address['data'])) {
... ...