Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -27,6 +27,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.UserShareGoodsHistoryMapper;

import com.yeshi.fanli.dao.mybatis.share.ShareMapper;

import com.yeshi.fanli.dto.user.UserInviteLevelEnum;

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

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

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

@@ -655,4 +656,5 @@
      return userInfoMapper.selectAvailableByPrimaryKey(uid);

   }





}