Merge branch 'dev' of…

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

src/modules/college-manage/modal/SetEmployeeModal.jsx

@@ -77,7 +77,7 @@ export default class SetEmployeeModal extends React.Component {
             ))}
             ))}
           </div>
           </div>
           <div className="detail-box">
           <div className="detail-box">
-            <div className="title">员工身份：</div>
+            <div className="title">员工角色：</div>
             <RadioGroup
             <RadioGroup
               value={roleCode}
               value={roleCode}
               onChange={(e) => {
               onChange={(e) => {

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

@@ -40,6 +40,7 @@
       color: #666666;
       color: #666666;
       width: 234px;
       width: 234px;
       overflow-x: scroll;
       overflow-x: scroll;
+      overflow-y: hidden;
       .anticon {
       .anticon {
         color: #999999;
         color: #999999;
       }
       }