fix a bug in croppic
Merge branch 'master' into wdj
完成商店首页的API接口
合并wdj分支
Merge remote-tracking branch 'origin/master' into pzhyy