From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
index 2773024..0650cfa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -202,8 +202,10 @@
 
 	/**
 	 * 缈婚〉鏌ヨ
+     * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link #pageVo(IPage, Wrapper)}
 	 */
 	@Override
+    @Deprecated
 	public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
 		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
 		List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
@@ -217,7 +219,7 @@
      * @param page         缈婚〉瀵硅薄
      * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
      */
-    public IPage<V> pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
+    public <P extends IPage<V>> P pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
         return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
     }
 

--
Gitblit v1.9.3