注释变了下
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'
user.conf重新生成，测试选择词库a后选择默认单词的情况