Merge pull request #6 from easydian/jundong

Jundong
Merge branches 'master' and 'canyin_ui' into canyin_ui
Small bug for feature table page