Merge branch 'zx_saas_message' into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CbsUserServiceImpl.java

@@ -34,7 +34,7 @@ public class CbsUserServiceImpl implements CbsUserService {
                 CbsUserWrapper.User user = new CbsUserWrapper.User();
                 user.setId(simpleUserDto.getUserId().longValue());
                 user.setUsername(query.getClientType() == null || query.getClientType() == EClientType.STUDENT ?
-                        simpleUserDto.getNickName() : simpleUserDto.getRealName());
+                        simpleUserDto.getNickName() : simpleUserDto.getUserName());
                 user.setPhone(simpleUserDto.getPhone());
                 result.add(user);
             }