final——cangji
fixed bugs
Merge branch 'wenxinshi'
done