Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

src/components/AttachmentUpload.vue

@@ -19,7 +19,7 @@
         <el-form-item label="其他文件">
           <el-card style="width: 100%">
             <file-upload @getFile="getOtherFile"/>
-            <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -226,5 +226,7 @@ defineExpose({
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>