Commit 9bce403e authored by zhanglu's avatar zhanglu

Merge branch 'hotfix/bug' into 'master'

Hotfix/bug

See merge request alpha/sun!12
parents 12b25f03 e2fdc0bf
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否线"> <el-table-column align="center" label="是否线">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.is_online | isOnlineFilter">{{ scope.row.is_online=== 1 ? '是' : '否' }}</el-tag> <el-tag :type="scope.row.is_online | isOnlineFilter">{{ scope.row.is_online=== 1 ? '是' : '否' }}</el-tag>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment