Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-17 16:54:56 +08:00
commit 1b7c0c2c03
1 changed files with 1 additions and 1 deletions

View File

@ -2105,7 +2105,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
countMap.put(count.get("type").toString(), Integer.parseInt(count.get("count").toString())); countMap.put(count.get("type").toString(), Integer.parseInt(count.get("count").toString()));
} }
}); });
typeCountListMap2.remove(typeCountListMap2.get(index.get("name").toString()));// 去除 typeCountListMap2.remove(index.get("name").toString());// 去除
} }
return index; return index;
}).collect(Collectors.toList()); }).collect(Collectors.toList());