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

Conflicts:
	MShop/src/com/zhbit/dao/impl/OrderDaoBean.java
Signed-off-by: ferry9303 <ferry9303@163.com>