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