fix:merge

src/core/antd.less

@@ -2,7 +2,7 @@
  * @Author: Michael 
  * @Date: 2017-09-08 17:38:18 
  * @Last Modified by: chenshu
- * @Last Modified time: 2021-06-04 15:38:14
+ * @Last Modified time: 2021-06-04 15:39:32
  */
 @import './variables.less';
 
@@ -620,13 +620,8 @@ mr0 {
 td.ant-table-column-sort{
   background: none;
 }
-<<<<<<< Updated upstream
-.ant-modal-content .ant-table-thead > tr > th{
-  padding:9px 24px;
-=======
 .ant-modal-content .ant-table-thead > tr > th {
   padding: 9px 24px !important;
->>>>>>> Stashed changes
 }
 
 .ant-modal-content tr > td{
@@ -805,12 +800,5 @@ td.ant-table-column-sort{
 
 // 排序小三角
 .ant-table-column-sorter {
-<<<<<<< Updated upstream
-  margin-left: 2px!important;
-}
-.ant-table-column-sorter-full{
-  margin-top:-0.32rem !important;
-=======
   margin-left: 8px !important;
->>>>>>> Stashed changes
 }

src/modules/teach-tool/examination-manager/AddExam.tsx

@@ -269,16 +269,9 @@ function AddExam(props: any) {
         <Breadcrumbs navList={title} goBack={handleGoBack} />
 
         <div className="box">
-<<<<<<< Updated upstream
             <Alert message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" type="info" showIcon />
             <div className="form">
                 <div className="title">基本信息</div>
-=======
-        <div className="show-tips">
-            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
-          </div>            <div className="form">
-                <div className="title first">基本信息</div>
->>>>>>> Stashed changes
                 <Form
                     labelCol={{ span: 3 }}
                     wrapperCol={{ span: 14 }}