解决一个死循环的问题
Merge remote-tracking branch 'origin/develop' into develop