Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-04-24 17:14:59 +08:00
2 changed files with 2 additions and 2 deletions
@@ -970,7 +970,7 @@
.bzjdStep3 { .bzjdStep3 {
.itemsTextBox { .itemsTextBox {
min-height: 300px; min-height: 300px;
max-height: 500px; max-height: 835px;
overflow: auto; overflow: auto;
line-height: 20px; line-height: 20px;
/deep/ td { /deep/ td {
@@ -316,7 +316,7 @@
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="创建时间" label="创建时间"
align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
</template> </template>