Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -1024,8 +1024,10 @@ public class AppPermissionService {
         }
         Map<Integer, AppUserDetail> userIdAndAppUserDetail = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(appUserLogin.getId()));
         AppUserDetail appUserDetail = userIdAndAppUserDetail.get(appUserLogin.getId());
-        imiVo.setNickname(appUserDetail.getNickname());
-        imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        if (appUserDetail != null) {
+            imiVo.setNickname(appUserDetail.getNickname());
+            imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        }
         return imiVo;
     }