From 8cc26dd54779273f895a3cbc3f84c8933a02a0dc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 10 七月 2024 14:44:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/pom.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/pom.xml b/hangzhoumesParent/moduleService/pom.xml
index 1ae04ab..55ea5f6 100644
--- a/hangzhoumesParent/moduleService/pom.xml
+++ b/hangzhoumesParent/moduleService/pom.xml
@@ -6,6 +6,7 @@
<artifactId>hangzhoumesParent</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +18,7 @@
<module>LoadGlassModule</module>
<module>TemperingGlassModule</module>
<module>UnLoadGlassModule</module>
+ <module>GlassStorageModule</module>
</modules>
<properties>
@@ -37,11 +39,11 @@
</dependency>
<!--渚濊禆鏈嶅姟鐨勫伐鍏风被-->
- <dependency>
- <groupId>com.mes</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>com.mes</groupId>-->
+ <!-- <artifactId>common</artifactId>-->
+ <!-- <version>1.0-SNAPSHOT</version>-->
+ <!-- </dependency>-->
<dependency>
<artifactId>servicebase</artifactId>
@@ -55,11 +57,11 @@
</dependency>
<!--寮�鍙戣�呭伐鍏�-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.boot</groupId>-->
+ <!-- <artifactId>spring-boot-devtools</artifactId>-->
+ <!-- <optional>true</optional>-->
+ <!-- </dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -67,6 +69,12 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
--
Gitblit v1.8.0