From 11307b25b3898578cd5867751c1dbfaa7300f148 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 15:19:07 +0800
Subject: [PATCH] 解决冲突恢复代码
---
pipIrr-platform/pipIrr-web/pom.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml
index 1f1dd86..abd60b2 100644
--- a/pipIrr-platform/pipIrr-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pom.xml
@@ -18,6 +18,7 @@
<description>姝ゆā鍧椾负鍏朵粬web妯″潡鐨勫眬閮ㄥ叏灞�妯″潡锛屽彧瀹氫箟渚濊禆</description>
<modules>
+ <module>pipIrr-mwTest-rtu</module>
<module>pipIrr-mwTest-web</module>
<module>pipIrr-web-sso</module>
<module>pipIrr-web-base</module>
@@ -64,6 +65,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</dependency>
--
Gitblit v1.8.0