From 759a0fcb320c7af510751a59b92b5e2ab437e107 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 25 Feb 2020 13:49:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=87=BB=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=97=B6=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=A4=8D=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/tool/gen/importTable.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
index e4418708..01606e6e 100644
--- a/ruoyi-ui/src/views/tool/gen/importTable.vue
+++ b/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);

From bb1340ecc6f1a6bf40ccf7eebcb58312f6c6af4d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 25 Feb 2020 19:33:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E6=98=BE=E7=A4=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/monitor/operlog/index.vue     | 2 +-
 ruoyi/src/main/resources/vm/java/mapper.java.vm  | 2 +-
 ruoyi/src/main/resources/vm/java/service.java.vm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index f5e2e636..9173ea6e 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/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>
diff --git a/ruoyi/src/main/resources/vm/java/mapper.java.vm b/ruoyi/src/main/resources/vm/java/mapper.java.vm
index 9297d0ec..5502baf6 100644
--- a/ruoyi/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi/src/main/resources/vm/java/mapper.java.vm
@@ -1,7 +1,7 @@
 package ${packageName}.mapper;
 
-import ${packageName}.domain.${ClassName};
 import java.util.List;
+import ${packageName}.domain.${ClassName};
 
 /**
  * ${functionName}Mapper接口
diff --git a/ruoyi/src/main/resources/vm/java/service.java.vm b/ruoyi/src/main/resources/vm/java/service.java.vm
index 27b0ebd1..af422f34 100644
--- a/ruoyi/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi/src/main/resources/vm/java/service.java.vm
@@ -1,7 +1,7 @@
 package ${packageName}.service;
 
-import ${packageName}.domain.${ClassName};
 import java.util.List;
+import ${packageName}.domain.${ClassName};
 
 /**
  * ${functionName}Service接口