Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-17 16:07:29 +08:00
commit 1b9f87b6ff
1 changed files with 0 additions and 1 deletions

View File

@ -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);