These two categories are aggregated in the tables.

• 在表中这两大类综合在一起。