src/main/java/cn/quantgroup/xyqb/model · feb433b51fafa3c1c9de09090ac97346c26649a8 · head_group / xyqb-user2 · GitLab

History Find file

Merge branch 'master' into feature/20170622 · 04227894

Java—红包—徐然 authored Jul 13, 2017

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
#	src/main/resources/config/dev/xyqb.properties

04227894

Name	Last commit	Last update
..
jr58		Loading commit data...
model		Loading commit data...
session		Loading commit data...
webchat		Loading commit data...
AddressRet.java		Loading commit data...
AppSmsUserParam.java		Loading commit data...
AppUserParam.java		Loading commit data...
AuthBean.java		Loading commit data...
ContactRet.java		Loading commit data...
Gender.java		Loading commit data...
IdCardInfo.java		Loading commit data...
IdType.java		Loading commit data...
JsonResult.java		Loading commit data...
LoginProperties.java		Loading commit data...
PageModel.java		Loading commit data...
Tuple.java		Loading commit data...
UserDetailRet.java		Loading commit data...
UserExtInfoRet.java		Loading commit data...
UserInfo.java		Loading commit data...
UserModel.java		Loading commit data...
UserQueryInfo.java		Loading commit data...
UserRet.java		Loading commit data...
UserSpouseRet.java		Loading commit data...
UserStatistics.java		Loading commit data...