From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 ruoyi-generator/src/main/resources/vm/java/service.java.vm |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 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 9ae8620..0041c39 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -1,10 +1,8 @@
 package ${packageName}.service;
 
 import ${packageName}.domain.${ClassName};
-import ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -19,7 +17,7 @@
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
+public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
 	/**
 	 * 鏌ヨ鍗曚釜
 	 * @return
@@ -30,27 +28,27 @@
 	/**
 	 * 鏌ヨ鍒楄〃
 	 */
-    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
+    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo);
 #end
 
 	/**
 	 * 鏌ヨ鍒楄〃
 	 */
-	List<${ClassName}Vo> queryList(${ClassName}QueryBo bo);
+	List<${ClassName}Vo> queryList(${ClassName}Bo bo);
 
 	/**
 	 * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
 	 * @param bo ${functionName}鏂板涓氬姟瀵硅薄
 	 * @return
 	 */
-	Boolean insertByAddBo(${ClassName}AddBo bo);
+	Boolean insertByBo(${ClassName}Bo bo);
 
 	/**
 	 * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
 	 * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
 	 * @return
 	 */
-	Boolean updateByEditBo(${ClassName}EditBo bo);
+	Boolean updateByBo(${ClassName}Bo bo);
 
 	/**
 	 * 鏍¢獙骞跺垹闄ゆ暟鎹�

--
Gitblit v1.9.3