Merge remote-tracking branch 'origin/master'

zengh

2022-03-03 bc493033ebc2ab2bea86626f3cc66727cb993b7e

Merge remote-tracking branch 'origin/master'

 pom.xml

@@ -77,7 +77,6 @@
        <dependency>
            <groupId>commons-net</groupId>
            <artifactId>commons-net</artifactId>
            <version>1.4.1</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -550,6 +550,8 @@
            User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
            // 设置租户ID
            user.setTenantId("000000");
            user.setRoleId("1372092102682521602");
            user.setDeptId("1424615972718895106");
            //查询身份证号是否有重复的,有的话只更新
            User user1 = new User();
            user1.setCardid(user.getCardid());