From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
index ae6ecbe..e0111e5 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
@@ -7,14 +7,13 @@
/**
* 涓氬姟瀛楁 鏈嶅姟灞�
- *
+ *
* @author ruoyi
*/
-public interface IGenTableColumnService extends IService<GenTableColumn>
-{
+public interface IGenTableColumnService extends IService<GenTableColumn> {
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
- *
+ *
* @param tableId 涓氬姟瀛楁缂栧彿
* @return 涓氬姟瀛楁闆嗗悎
*/
@@ -22,7 +21,7 @@
/**
* 鏂板涓氬姟瀛楁
- *
+ *
* @param genTableColumn 涓氬姟瀛楁淇℃伅
* @return 缁撴灉
*/
@@ -30,7 +29,7 @@
/**
* 淇敼涓氬姟瀛楁
- *
+ *
* @param genTableColumn 涓氬姟瀛楁淇℃伅
* @return 缁撴灉
*/
@@ -38,7 +37,7 @@
/**
* 鍒犻櫎涓氬姟瀛楁淇℃伅
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
--
Gitblit v1.9.3