admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
疯狂的狮子li 2022-01-04 10:10:59 +08:00
commit 92653f3deb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -26,7 +26,7 @@
<easyexcel.version>2.2.11</easyexcel.version> <easyexcel.version>2.2.11</easyexcel.version>
<cglib.version>3.3.0</cglib.version> <cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.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> <p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.18</hutool.version> <hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version> <okhttp.version>4.9.2</okhttp.version>

3
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
View File

@ -11,7 +11,6 @@ import com.ruoyi.demo.domain.TestDemo;
import com.ruoyi.demo.domain.vo.TestDemoVo; import com.ruoyi.demo.domain.vo.TestDemoVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -55,5 +54,5 @@ public interface TestDemoMapper extends BaseMapperPlus<TestDemo> {
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "dept_id"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "user_id")
}) })
int deleteBatchIds(@Param(Constants.COLLECTION) Collection<? extends Serializable> idList); int deleteBatchIds(@Param(Constants.COLLECTION) Collection<?> idList);
} }