src/main/java/cn/quantgroup/xyqb/entity · 2467e8c54cbb77812df2d743f5aee0a2a7127855 · head_group / xyqb-user2 · GitLab

History Find file

Merge branch 'master' into baitiao_channel · bc45a3e4

Java-刘彧阳 authored May 19, 2017

Conflicts:
	src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java
	src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

bc45a3e4

Name	Last commit	Last update
..
enumerate		Loading commit data...
Address.java		Loading commit data...
Channel.java		Loading commit data...
Contact.java		Loading commit data...
Merchant.java		Loading commit data...
MerchantConfig.java		Loading commit data...
User.java		Loading commit data...
UserBtRegister.java		Loading commit data...
UserDetail.java		Loading commit data...
UserExtInfo.java		Loading commit data...
UserJr58.java		Loading commit data...
UserSpouse.java		Loading commit data...
UuidPhoneMapping.java		Loading commit data...
WechatUserInfo.java		Loading commit data...