Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit ee74568be0beba46da19616f5832e83f9164c688

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -243,7 +243,7 @@
                 :label="$t('load_test.file_type')">
               </el-table-column>
               <el-table-column
-                :label="$t('load_test.last_modify_time')">
+                :label="$t('test_track.case.upload_time')">
                 <template v-slot:default="scope">
                   <i class="el-icon-time"/>
                   <span class="last-modified">{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -664,7 +664,7 @@ export default {
         name: file.name,
         size: file.size + ' Bytes', /// todo: 按照大小显示Byte、KB、MB等
         type: type.toUpperCase(),
-        updateTime: file.lastModified,
+        updateTime: new Date().getTime(),
       });
 
       return true;

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

frontend/src/i18n/en-US.js

@@ -748,6 +748,7 @@ export default {
       pdf_loading_fail: "PDF loading failed",
       upload_tip: "Only jpg, jpeg, png, docx, doc, pdf, xlsx files can be uploaded",
       attachment: "Attachment",
+      upload_time: "Upload Time",
       import: {
         import: "Import test case",
         case_import: "Import test case",

frontend/src/i18n/zh-CN.js

@@ -752,6 +752,7 @@ export default {
       pdf_loading_fail: "PDF加载失败",
       upload_tip: "只能上传jpg、jpeg、png、docx、doc、pdf、xlsx文件",
       attachment: "附件",
+      upload_time: "上传时间",
       import: {
         import: "导入用例",
         case_import: "导入测试用例",

frontend/src/i18n/zh-TW.js

@@ -752,6 +752,7 @@ export default {
       pdf_loading_fail: "PDF加載失敗",
       upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx文件",
       attachment: "附件",
+      upload_time: "上傳時間",
       import: {
         import: "導入用例",
         case_import: "導入測試用例",