Merge branch 'master' into docker_package
This commit is contained in:
commit
1b7c0c2c03
|
@ -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());
|
||||||
|
|
Loading…
Reference in New Issue