先提交再撤销
Revert "先提交再撤销"

This reverts commit 86e8eca128e32ef0aba16aac38d1cf850154f00f.
Revert "先同步代码"

This reverts commit faae097f5e7bd8fe6d33574afd351374fa51cf21.