Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-12-30 e9d368ed0c87286a174b62756b72f6a896d15ce4

 ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -90,6 +90,8 @@
                <el-option label="单选框" value="radio" />
                <el-option label="复选框" value="checkbox" />
                <el-option label="日期控件" value="datetime" />
                <el-option label="上传控件" value="uploadImage" />
                <el-option label="富文本控件" value="editor" />
              </el-select>
            </template>
          </el-table-column>