lbqms.git - Gitblit

兰宝车间质量管理系统

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

疯狂的狮子li

2021-10-26 61375c4bbbcc2966f49c367b39a96f0157578b95

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

 Conflicts:
	ruoyi-common/pom.xml

已修改1个文件

ruoyi-common/pom.xml

6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史

 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>

			@@ -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>