Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
#	src/main/java/cn/quantgroup/xyqb/service/user/IAddressService.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/AddressServiceImpl.java

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -220,7 +220,7 @@ public class InnerController {
         }
         List<Contact> userContact = contactService.findByUserId(userId);
         if(userContact != null && userContact.size() >= 2) {
-            return JsonResult.buildErrorStateResult("用户联系人最多保存两条记录.", null);
+            return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(userContact));
         }
         List<Contact> contacts = JSONObject.parseObject(contactsStr, new TypeReference<List<Contact>>() {});
         if (CollectionUtils.isEmpty(contacts)) {