a
Merge branch 'master' of https://github.com/hjra/may5.git

Conflicts:
	CShop/src/main/java/net/may5/controller/OrderController.java
	CShop/src/main/java/net/may5/dao/OrderMapper.java
	CShop/src/main/java/net/may5/dao/OrderMapper.xml
	CShop/src/main/java/net/may5/service/OrderService.java
	CShop/src/main/java/net/may5/service/OrderServiceImpl.java
	CShop/src/main/webapp/WEB-INF/views/mng/deliveryMng/dlvNotice.jsp
Merge branch 'master' of https://github.com/hjra/may5.git