modify history file transfer cancel button location
fix conflict
Merge branch 'master' of https://github.com/liangxiaofei1100/ZhaoYanJuYou
modify 1217
Add SelectInterface
fix conflict