From 827bbc2b17fdcf2638a9646af0e99821aa63caa1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 21 六月 2020 10:06:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
index 85a3613..54178c1 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -80,6 +80,7 @@
      * @param genTable 涓氬姟淇℃伅
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
+    @Override
     public List<GenTable> selectDbTableList(GenTable genTable)
     {
         return genTableMapper.selectDbTableList(genTable);
@@ -91,6 +92,7 @@
      * @param tableNames 琛ㄥ悕绉扮粍
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
+    @Override
     public List<GenTable> selectDbTableListByNames(String[] tableNames)
     {
         return genTableMapper.selectDbTableListByNames(tableNames);
@@ -121,7 +123,7 @@
     /**
      * 鍒犻櫎涓氬姟瀵硅薄
      * 
-     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+     * @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
     @Override
@@ -173,6 +175,7 @@
      * @param tableId 琛ㄧ紪鍙�
      * @return 棰勮鏁版嵁鍒楄〃
      */
+    @Override
     public Map<String, String> previewCode(Long tableId)
     {
         Map<String, String> dataMap = new LinkedHashMap<>();
@@ -277,6 +280,7 @@
      * 
      * @param genTable 涓氬姟淇℃伅
      */
+    @Override
     public void validateEdit(GenTable genTable)
     {
         if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
@@ -301,7 +305,7 @@
     /**
      * 璁剧疆涓婚敭鍒椾俊鎭�
      * 
-     * @param genTable 涓氬姟琛ㄤ俊鎭�
+     * @param table 涓氬姟琛ㄤ俊鎭�
      * @param columns 涓氬姟瀛楁鍒楄〃
      */
     public void setPkColumn(GenTable table, List<GenTableColumn> columns)

--
Gitblit v1.9.3