mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts: ruoyi-ui/src/views/login/auth-redirect.vue ruoyi-ui/src/views/login/components/SocialSignin.vue ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/tool/gen/editTable.vue
This commit is contained in:
@ -13,12 +13,11 @@
|
||||
min-width="10%"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="字段描述"
|
||||
prop="columnComment"
|
||||
min-width="10%"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="字段描述" min-width="10%">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.columnComment"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="物理类型"
|
||||
prop="columnType"
|
||||
|
Reference in New Issue
Block a user