Merge branch 'dev' into test

# Conflicts: # myapp-web/src/main/webapp/WEB-INF/web.xml

Merge branch 'dev' into test
# Conflicts: # myapp-web/src/main/webapp/WEB-INF/web.xml
jiangchengyong
2 parents 6730be77 8bcd7963
Showing 1 changed file with 1 additions and 1 deletions
myapp-web/src/main/webapp/WEB-INF/web.xml
@@ -79,7 +79,7 @@
  
     <!--配置欢迎界面-->
     <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.jsp,index.jsp,index.jsp,index.jsp</welcome-file>
     </welcome-file-list>
  
 </web-app>