Merge remote-tracking branch 'origin/master'

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

src/views/project-demand/summary/upload.vue

@@ -8,7 +8,7 @@
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile"/>
-    <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="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -129,5 +129,7 @@ const handleSubmit = async () => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>