1121_delete dialog modfiy
Merge branch 'master' of https://github.com/liangxiaofei1100/ZhaoYanJuYou
appinfo some modify
fix conflict