1 Commits

Author SHA1 Message Date
yuanxing
c8da2f9666 fix:merge two patch due to conflicts of resource page scroll window and get correct cpu info
- 合并两个patch由于其对资源页面滑动区域的修改导致的资源页面显示不正常
- 移除"add cpuinfo"补丁来获取正确的cpu信息

Fix #6964,#6965
2023-06-15 13:56:00 +08:00