Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-10-28 3f0d3ffb8a64b7eff32cde91a0ab13922a2a3729

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev


 Conflicts:

	pom.xml

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

 ruoyi-common/pom.xml

@@ -76,6 +76,12 @@
            <artifactId>jjwt</artifactId>
        </dependency>

        <!-- Jaxb -->
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
        </dependency>

        <!-- redis 缓存操作 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -170,7 +170,7 @@
    }

    /**
     * 校验用户名称是否唯一
     * 校验手机号码是否唯一
     *
     * @param user 用户信息
     * @return