From 92653f3deb3f0f03ee9bfef3e9322fb94c90938c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 04 一月 2022 10:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 2 +-
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91fd51a..7ee55e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<easyexcel.version>2.2.11</easyexcel.version>
<cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.version>
- <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+ <mybatis-plus.version>3.5.0</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version>
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
index 7a3cb62..243b6dc 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
@@ -11,7 +11,6 @@
import com.ruoyi.demo.domain.vo.TestDemoVo;
import org.apache.ibatis.annotations.Param;
-import java.io.Serializable;
import java.util.Collection;
import java.util.List;
@@ -55,5 +54,5 @@
@DataColumn(key = "deptName", value = "dept_id"),
@DataColumn(key = "userName", value = "user_id")
})
- int deleteBatchIds(@Param(Constants.COLLECTION) Collection<? extends Serializable> idList);
+ int deleteBatchIds(@Param(Constants.COLLECTION) Collection<?> idList);
}
--
Gitblit v1.9.3