lock unlock fix bug
Merge branch 'master' of github.com:antme/x-e-commerce
add usermanage function for customer service
Merge branch 'master' of github.com:antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/src/main/java/com/ecom/service/impl/ECommerceUserServiceImpl.java
	ecommerce/ecservice/src/main/webapp/pages/admin/user/manage.jsp
Merge branch 'master' of github.com:antme/x-e-commerce