Merge branch 'master' of E:\workspace\aimeigo with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes.js
可以添加商品
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/mod/mod.side.html
detail页面