Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper into dev

epmet-oper-web/src/views/modules/oss/oss.vue

@@ -21,7 +21,7 @@
         style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="createdTime" label="上传时间" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>