From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
index 894f689..c55a9a2 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
@@ -1,23 +1,31 @@
 package com.ruoyi.generator.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.generator.domain.GenTable;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 涓氬姟 鏁版嵁灞�
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public interface GenTableMapper extends BaseMapper<GenTable> {
+public interface GenTableMapper extends BaseMapperPlus<GenTable> {
+
+
+    Page<GenTable> selectPageGenTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
+
+    Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
+
     /**
      * 鏌ヨ涓氬姟鍒楄〃
      *
      * @param genTable 涓氬姟淇℃伅
      * @return 涓氬姟闆嗗悎
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 鏌ヨ鎹簱鍒楄〃
@@ -25,7 +33,7 @@
      * @param genTable 涓氬姟淇℃伅
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 鏌ヨ鎹簱鍒楄〃
@@ -33,14 +41,14 @@
      * @param tableNames 琛ㄥ悕绉扮粍
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+    List<GenTable> selectDbTableListByNames(String[] tableNames);
 
     /**
      * 鏌ヨ鎵�鏈夎〃淇℃伅
      *
      * @return 琛ㄤ俊鎭泦鍚�
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 鏌ヨ琛↖D涓氬姟淇℃伅
@@ -48,7 +56,7 @@
      * @param id 涓氬姟ID
      * @return 涓氬姟淇℃伅
      */
-    public GenTable selectGenTableById(Long id);
+    GenTable selectGenTableById(Long id);
 
     /**
      * 鏌ヨ琛ㄥ悕绉颁笟鍔′俊鎭�
@@ -56,6 +64,6 @@
      * @param tableName 琛ㄥ悕绉�
      * @return 涓氬姟淇℃伅
      */
-    public GenTable selectGenTableByName(String tableName);
+    GenTable selectGenTableByName(String tableName);
 
 }

--
Gitblit v1.9.3