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

Conflicts: ruoyi-common/pom.xml
2021-10-26 18:57:55 +08:00 · 2021-10-26 18:57:55 +08:00 · 61375c4bbb
commit 61375c4bbb
parent 2e4689d557 b6596d021b
1 changed files with 3 additions and 3 deletions
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@ -37,8 +37,8 @@

        <!-- 自定义验证注解 -->
        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>

        <!--常用工具类 -->
@ -175,4 +175,4 @@
        </dependency>
    </dependencies>

-</project>
+</project>