fix bug
Merge branch 'master' of https://github.com/antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/src/main/webapp/pages/admin/user/approvehistory.jsp