Merge branch 'master' into docker_package

2022-10-17 16:07:36 +08:00 · 2022-10-17 16:07:36 +08:00 · abcf6a16ea
parent 3f290fd2dd 1b9f87b6ff
commit abcf6a16ea
1 changed files with 0 additions and 1 deletions
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@ -2131,7 +2131,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                    map.put("jcss", "0");
                    map.put("zsk", "0");
                    map.put("sjzy", "0");
-                    map.put("hys", "0");
                    return map;
                }).collect(Collectors.toList()); // 会议室的
                resultList.addAll(temp);