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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

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

 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>

 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);
}