1771245e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 980d6f0a 0e51c16b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 --> 4 -->
5 <template> 5 <template>
6 <div class='ywdialog'> 6 <div class='ywdialog'>
7 <el-link type="danger">{{formData.message}}</el-link> 7 <el-link type="danger" :underline="false">{{formData.message}}</el-link>
8 <el-table 8 <el-table
9 v-if="formData.result" 9 v-if="formData.result"
10 :data="formData.result" 10 :data="formData.result"
......