Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_v2

# Conflicts:
#	models/seller.go