Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -148,8 +148,8 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 
 			<li class="nav-header">维护</li>
-			<li class="nav-node"><a href="#/brand/map"><i
-					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
+			<!--<li class="nav-node"><a href="#/brand/map"><i-->
+					<!--class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>-->
 			<li class="nav-node"><a href="#/store/company"><i
 					class="fa fa-flag"></i><span> 寄售管理</span></a></li>
 			<li class="nav-node"><a href="#/store/list"><i