Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/view/common/sidebar.html

@@ -381,10 +381,10 @@
 			</a>
 			<div class="massage sidebar-menu" style="width: 100px;" title="优软客服">优软互联<em><span ng-if="userInfo">(<span ng-bind="countData || 0 | number"></span>)</span></em></div>
 		</li>
-		<li ng-controller="ScrollToTopCtrl">
-			<a href="javascript:void(0)" ng-click="scrollToTop()"><img src="static/img/icon/top.png"/></a>
-			<div class="sidebar-menu" style="width: 100px">返回顶部</div>
-		</li>
+		<!--<li ng-controller="ScrollToTopCtrl">-->
+			<!--<a href="javascript:void(0)" ng-click="scrollToTop()"><img src="static/img/icon/top.png"/></a>-->
+			<!--<div class="sidebar-menu" style="width: 100px">返回顶部</div>-->
+		<!--</li>-->
 	</ul>
 </div>
 <div id="sidebar" style="height: 76px;bottom: 10px;top: inherit;">