Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

src/modules/teach-tool/components/CourseCategorySiderTree.less

@@ -39,8 +39,8 @@
       font-weight: 400;
       font-weight: 400;
       color: #666666;
       color: #666666;
       width: 234px;
       width: 234px;
-      overflow-x: scroll;
-      overflow-y: hidden;
+      // overflow-x: scroll;
+      // overflow-y: hidden;
       .anticon {
       .anticon {
         color: #999999;
         color: #999999;
       }
       }

src/modules/teach-tool/examination-manager/index.less

@@ -18,4 +18,8 @@
       background: #fafafa;
       background: #fafafa;
     }
     }
   }
   }
+  .ant-table-wrapper {
+    max-height: calc(100vh - 280px);
+    overflow: scroll;
+  }
 }
 }