修复多个编译失败与警告问题#503

Mysvac wants to merge 2 commits into

BoomingTech:mainBoomingTech/Piccolo:mainfrom

Mysvac:mainMysvac/Piccolo:mainCopy head branch name to clipboard