Commit 8e859200b87b0c298419f0cd5ca91fe76e3606aa
Merge branch 'dev' into test
# Conflicts: # myapp-web/src/main/webapp/WEB-INF/web.xml
Showing
1 changed file
with
1 additions
and
1 deletions
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</welcome-file> | 82 | + <welcome-file>index.jsp,index.jsp,index.jsp,index.jsp</welcome-file> |
83 | </welcome-file-list> | 83 | </welcome-file-list> |
84 | 84 | ||
85 | </web-app> | 85 | </web-app> |