Signed-off-by: suding <suding174@sina.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git
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/test/test.java
	MShop/src/com/zhbit/web/action/AdminAction.java
	MShop/src/struts-admin.xml

Signed-off-by: suding <suding174@sina.com>
后台框架

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