连个xml文件的action部分
action 层
配置
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreditManage/target/classes/springconf/applicationContext.xml
	CreditManage/target/classes/struts.xml