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-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java index c011325..eb4f21b 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java @@ -1,10 +1,8 @@ package com.ruoyi.demo.service; import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.vo.TestDemoVo; -import com.ruoyi.demo.bo.TestDemoQueryBo; -import com.ruoyi.demo.bo.TestDemoAddBo; -import com.ruoyi.demo.bo.TestDemoEditBo; +import com.ruoyi.demo.domain.vo.TestDemoVo; +import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; @@ -15,9 +13,9 @@ * 娴嬭瘯鍗曡〃Service鎺ュ彛 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ -public interface ITestDemoService extends IServicePlus<TestDemo> { +public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> { /** * 鏌ヨ鍗曚釜 @@ -28,25 +26,31 @@ /** * 鏌ヨ鍒楄〃 */ - TableDataInfo<TestDemoVo> queryPageList(TestDemoQueryBo bo); + TableDataInfo<TestDemoVo> queryPageList(TestDemoBo bo); + /** + * 鑷畾涔夊垎椤垫煡璇� + */ + TableDataInfo<TestDemoVo> customPageList(TestDemoBo bo); + + /** * 鏌ヨ鍒楄〃 */ - List<TestDemoVo> queryList(TestDemoQueryBo bo); + List<TestDemoVo> queryList(TestDemoBo bo); /** * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆娴嬭瘯鍗曡〃 * @param bo 娴嬭瘯鍗曡〃鏂板涓氬姟瀵硅薄 * @return */ - Boolean insertByAddBo(TestDemoAddBo bo); + Boolean insertByBo(TestDemoBo bo); /** * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼娴嬭瘯鍗曡〃 * @param bo 娴嬭瘯鍗曡〃缂栬緫涓氬姟瀵硅薄 * @return */ - Boolean updateByEditBo(TestDemoEditBo bo); + Boolean updateByBo(TestDemoBo bo); /** * 鏍¢獙骞跺垹闄ゆ暟鎹� -- Gitblit v1.9.3