Merge remote-tracking branch 'origin/master'

src/views/common/AttachmentLib.vue

@@ -41,7 +41,7 @@
             </vxe-column>
             <vxe-column field="userName" sortable title="上传人">
             </vxe-column>
-            <vxe-column field="collectUserId" sortable title="收藏人">
+            <vxe-column field="collectUserName" sortable title="收藏人">
             </vxe-column>
             <vxe-column field="createTime" sortable title="上传/收藏时间">
             </vxe-column>

src/views/common/UpLoadComponentWorkCollect.vue

@@ -12,7 +12,7 @@
       </template>
       <template v-else #trigger>
         <el-button :loading="loading" type="primary" size="default"> 点击上传 </el-button>
-        <span style="margin-left: 20px;color: red;">提示:一次仅限上传1份文件</span>
+        <span style="margin-left: 20px;color: red;">提示:仅限上传1份文件</span>
       </template>
 
     </el-upload>