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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

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

@@ -193,6 +193,7 @@
      userInfoExtra.setFirstLoginTime(new Date());

      userInfoExtra.setCreateTime(new Date());

      userInfoExtra.setUpdateTime(new Date());

      userInfoExtra.setActiveTime(new Date());

      userInfoExtraMapper.insertSelective(userInfoExtra);

   }



@@ -662,7 +663,13 @@
   public UserInfoExtra getUserInfoExtra(Long uid) {

      return userInfoExtraMapper.getInfoExtraByUid(uid);

   }

	
   @Override

   public UserInfoExtra getUserALLInfo(Long uid) {

      return userInfoExtraMapper.gerUserRank(uid);

   }



	
   @Override

   public UserInfoExtra getByUidForUpdate(Long uid) {

      return userInfoExtraMapper.getByUidForUpdate(uid);