Signed-off-by: ferry9303 <ferry9303@163.com>
2014-05-31 15:39 ferry9303
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/com/zhbit/domain/OrderDetail.hbm.xml
Signed-off-by: ferry9303 <ferry9303@163.com>
Signed-off-by: ferry9303 <ferry9303@163.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/com/zhbit/domain/Accessory.hbm.xml
	MShop/src/com/zhbit/domain/Customer.hbm.xml
	MShop/src/com/zhbit/domain/Customer.java
	MShop/src/com/zhbit/service/ProductManageService.java
	MShop/src/com/zhbit/test/test.java
	MShop/src/config.properties
	MShop/src/struts.xml

Signed-off-by: ferry9303 <ferry9303@163.com>
Signed-off-by: ferry9303 <ferry9303@163.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/OrderDetailDao.java
	MShop/src/com/zhbit/dao/impl/OrderDaoBean.java
	MShop/src/com/zhbit/dao/impl/OrderDetailDaoBean.java
	MShop/src/com/zhbit/service/ProductManageService.java
	MShop/src/com/zhbit/test/test.java
	MShop/src/com/zhbit/web/action/CustomerAction.java
	MShop/src/config.properties