Revert 7 main#2

zhy888ai wants to merge 22 commits intoanthonywilliams:mainanthonywilliams/ticketmap:mainfrom

zhy888ai:revert-7-mainzhy888ai/ticketmap:revert-7-mainCopy head branch name to clipboard