Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -20,6 +20,7 @@
import org.hibernate.Query;

import org.hibernate.SQLQuery;

import org.hibernate.Session;

import org.springframework.context.annotation.Lazy;

import org.springframework.core.task.TaskExecutor;

import org.springframework.orm.hibernate4.HibernateCallback;

import org.springframework.stereotype.Service;

@@ -40,8 +41,6 @@
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;

import com.yeshi.fanli.dao.user.UserInfoDao;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

@@ -49,7 +48,6 @@
import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -135,6 +133,7 @@
   @Resource

   private BindingAccountService bindingAccountService;

   

   @Lazy

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;