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

Conflicts:
	MShop/src/com/zhbit/dao/PhoneBrandDao.java
	MShop/src/com/zhbit/dao/impl/PhoneBrandDaoBean.java
	MShop/src/com/zhbit/domain/Phone.hbm.xml
	MShop/src/com/zhbit/service/ProductManageService.java
	MShop/src/com/zhbit/service/impl/ProductManageServiceBean.java
	MShop/src/com/zhbit/web/action/ProductAction.java
	MShop/src/struts-product.xml

Signed-off-by: suding <suding174@sina.com>