shop API change and goods_collection and goods_map and hot_sails
Merge branch 'dev' of https://github.com/VectorWinner/takeaway into dev
final