for jshop2.0 milestone

Signed-off-by: erdai <peachorchard@qq.com>
for jshop2.0 milestone

Signed-off-by: erdai <peachorchard@qq.com>
Merge remote-tracking branch 'jshoperv2/v2'
修了一点bug