Commit ac05c23b23f86d70f87fe8cfe2b54ef0c60caf3e

Authored by jiangchengyong
2 parents 8e859200 50f8ac6e

Merge branch 'dev' into test

myapp-web/src/main/webapp/WEB-INF/web.xml
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 79
80 <!--配置欢迎界面--> 80 <!--配置欢迎界面-->
81 <welcome-file-list> 81 <welcome-file-list>
82 - <welcome-file>index.jsp,index.jsp,index.jsp,index.jsp</welcome-file> 82 + <welcome-file>index.jsp</welcome-file>
83 </welcome-file-list> 83 </welcome-file-list>
84 84
85 </web-app> 85 </web-app>