Merge branch 'guanyingcao-master'
Merge branch 'master' of https://github.com/liuwanwei/mallapp