Signed-off-by: suding <suding174@sina.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/com/zhbit/dao/CustomerDao.java
	MShop/src/com/zhbit/dao/OrderDao.java
	MShop/src/com/zhbit/dao/impl/OrderDaoBean.java
	MShop/src/struts.xml

Signed-off-by: suding <suding174@sina.com>
Signed-off-by: suding <suding174@sina.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/com/zhbit/dao/OrderDao.java
	MShop/src/com/zhbit/dao/impl/OrderDaoBean.java
	MShop/src/com/zhbit/domain/Product.java
	MShop/src/struts.xml