修改调用库
解决prorerties文件冲突
赵康修改

用户信息修改时的添加
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev