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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -201,7 +202,7 @@ public class InnerController {
         }
         List<Contact> contacts = contactService.findByUserId(userId);
         if(null == contacts || contacts.size() == 0) {
-            return JsonResult.buildErrorStateResult(null, null);
+            return JsonResult.buildSuccessResult(null, Collections.emptyList());
         }
         return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(contacts));
     }