git checkout master
git pull https://gitee.com/linsity/activity-school.git cherry-pick-1712414667
git push origin master
