1. Merge code edited by zzd.
@Cobble.Ge
Merge branch 'master' of https://github.com/cobble19/huasheng.git