Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -52,7 +52,7 @@ public class ImLiveRoomBlackServiceImpl extends ServiceImpl<ImLiveRoomBlackDao,
     @Override
     public PageInfo<SysUser> queryStudentList(Map<String, Object> param) {
         Page<SysUser> pageInfo = PageUtil.getPageInfo(param);
-        pageInfo.setDesc("a.id_");
+//        pageInfo.setDesc("a.id_");
         Integer tenantId = TenantContextHolder.getTenantId();
         //管理员机构id 是-1
         if (Objects.nonNull(tenantId) && tenantId != -1) {