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

 Conflicts:

	ruoyi-ui/src/views/monitor/operlog/index.vue

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

	ruoyi/src/main/resources/vm/java/mapper.java.vm

	ruoyi/src/main/resources/vm/java/service.java.vm

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -143,7 +143,7 @@
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="操作模块：">{{ form.title }} / 修改</el-form-item>
+            <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
             <el-form-item
               label="登录信息："
             >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>

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

@@ -26,7 +26,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="tableName" label="表名称"></el-table-column>
         <el-table-column prop="tableComment" label="表描述"></el-table-column>
@@ -76,6 +76,9 @@ export default {
       this.getList();
       this.visible = true;
     },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.tables = selection.map(item => item.tableName);