bug
Merge branch 'generation' of github.com:wangyg0826/ttRinHNdZeuvBw into generation