Merge branch 'master-new' into feature/data_clean

src/views/business/crm/company/form.vue

@@ -1711,7 +1711,7 @@ function upload(param) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.fileType =
         res.newFileName.split(".")[res.newFileName.split(".").length - 1];
       file.url = res.url;

src/views/business/production/financialReportTax/FormDialog.vue

@@ -608,7 +608,7 @@
         const file = {};
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.fileUrl = res.fileName;
         file.rawFileName = res.originalFilename;
         file.fileSize = param.file.size;