- 
http://gitabc.xyqb.com/head_group/xyqb-user2zhouqian authored
# 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
cfb931d6