Revert "we need revert this change"

include:
1: 修复报错
2: Merge remote-tracking branch 'origin/master'
3: 增加整备数组

This reverts commit 9dc27af0bc453d2b32683a5b60a403f242ed682f.