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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java

@@ -74,7 +74,7 @@


         for (GiveVIPApplyInfo info : list) {

            // 组织用户信息

            UserInfo userInfo = userInfoService.getUserById(info.getTargetUid());

            UserInfo userInfo = userInfoService.selectByPKey(info.getTargetUid());

            UserInfo simpleInfo = new UserInfo(userInfo.getId());

            simpleInfo.setNickName(userInfo.getNickName());

            simpleInfo.setPortrait(userInfo.getPortrait());