Merge branch 'fix_bug_first_stage'

# Conflicts:
#	jero-web/src/components/CollectionType/index.vue

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -55,8 +55,8 @@
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
-            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
+            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}dsf jdslfkj dsflkdsjfdslkfjds fldskfjdsklfds</a>
+            <a class="box-content-buttom" :title="result.title">{{result.title}}sdfdsfdsfdsfjds lfdjsfdslfjsflkdsfjdsklfdjsfklsd</a>
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -429,9 +429,9 @@
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 
-  /deep/ .ant-table td {
-    white-space: normal;
-  }
+  /*/deep/ .ant-table td {*/
+  /*  white-space: normal;*/
+  /*}*/
 
   .doc-detail {
     background: #fff;