From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-generator/src/main/resources/vm/java/service.java.vm | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 6a5ce97..9ae8620 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -5,7 +5,10 @@
import ${packageName}.bo.${ClassName}QueryBo;
import ${packageName}.bo.${ClassName}AddBo;
import ${packageName}.bo.${ClassName}EditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+#end
import java.util.Collection;
import java.util.List;
@@ -16,12 +19,19 @@
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service extends IService<${ClassName}> {
+public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
/**
* 鏌ヨ鍗曚釜
* @return
*/
${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+
+#if($table.crud || $table.sub)
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
+#end
/**
* 鏌ヨ鍒楄〃
@@ -48,5 +58,5 @@
* @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
* @return
*/
- Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
}
--
Gitblit v1.9.3