Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/system-management/user/user.component.scss

@@ -89,11 +89,12 @@
 }
 .box{
   flex: 1;
-  overflow: auto;
+  // overflow: auto;
   padding-top: 20px;
-  ::-webkit-scrollbar {
-    display: none;
-  }
+  overflow-y:auto;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
 }
 .topbox {
   width: 100%;
@@ -130,11 +131,8 @@
 .tablebox {
   flex: 1;
   overflow-y: auto;
-
-  //滚动条样式
-  ::-webkit-scrollbar {
-    display: none;
-  }
+  overflow: auto;
+ 
 }
 
 .pagination {