From 9c8c30d9ead02243a0cc3807fe6d47df9a6b51af Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 15:33:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/pom.xml | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index b6ecf42..4ac2af2 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -9,8 +9,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
-<!-- <packaging>jar</packaging>-->
- <artifactId>ruoyi-admin</artifactId>
+ <!-- <packaging>jar</packaging>-->
+ <artifactId>smartor-opo</artifactId>
<description>
web鏈嶅姟鍏ュ彛
@@ -45,7 +45,7 @@
<version>3.0.3</version>
</dependency>
- <!-- Mysql椹卞姩鍖� -->
+ <!-- Mysql椹卞姩鍖� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -81,9 +81,9 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.12</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.12</version>
</dependency>
<dependency>
@@ -116,17 +116,17 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3