orderinfo
orderinfo
Merge branch 'master' of https://github.com/zhouxin262/datapanel

Conflicts:
	ecshop/views.py