From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-ops/ubcs-develop/pom.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
index a678fb7..c9a8aa3 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
@@ -4,14 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-ops</artifactId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>blade-develop</artifactId>
+ <artifactId>ubcs-develop</artifactId>
<name>${project.artifactId}</name>
<version>${bladex.project.version}</version>
<packaging>jar</packaging>
@@ -31,13 +31,14 @@
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-common</artifactId>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-dict-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
--
Gitblit v1.9.3