Merge branch 'minhang' into pudong

# Conflicts: # src/main/resources/static/index.html

Merge branch 'minhang' into pudong
# Conflicts: # src/main/resources/static/index.html
潘钊
1 parent 9fa02e2e
Showing 1 changed file with 1 additions and 1 deletions
src/main/resources/static/index.html
@@ -206,7 +206,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				闵行公交调度系统 </a>
+				浦东公交调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->