Merge remote-tracking branch 'origin/master'

admin

2019-02-27 6b87b75baa2c780bd42f2bf961ed9d81d571a335

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

@@ -622,7 +622,7 @@


   @Override

   public UserInfo getUserByIdWithMybatis(long uid) {

      UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

      UserInfo user = userInfoMapper.selectByPKey(uid);

      return UserUtil.filterForClientUser(user);

   }