Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -1899,6 +1899,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         //会客厅
         CompletableFuture<Void> hkt = CompletableFuture.runAsync(() -> {
             QueryWrapper<TMeetingroom> wrapper = new QueryWrapper<>();
+            wrapper.eq("del_flag", 0);
             resultMap.put("会客厅", tMeetingroomMapper.selectCount(wrapper));
 
         }, executor);