From 23acc4e7eb8673e918620586b96eae25c3e651b2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/pom.xml | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index e337593..3f8dd9a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -48,6 +48,12 @@
</properties>
</profile>
<profile>
+ <id>mdprd</id>
+ <properties>
+ <env>mdprd</env>
+ </properties>
+ </profile>
+ <profile>
<id>xcx</id>
<properties>
<env>xcx</env>
@@ -57,6 +63,12 @@
<id>lhx</id>
<properties>
<env>lhx</env>
+ </properties>
+ </profile>
+ <profile>
+ <id>xcshop</id>
+ <properties>
+ <env>xcshop</env>
</properties>
</profile>
</profiles>
@@ -371,7 +383,11 @@
<artifactId>mapstruct</artifactId>
<version>1.3.0.Final</version>
</dependency>
-
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.2.0</version>
+ </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -387,15 +403,16 @@
<exclude>config/dev/*</exclude>
<exclude>config/prd/*</exclude>
+ <exclude>config/mdprd/*</exclude>
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
+ <exclude>config/xcshop/*</exclude>
- <!-- -->
+ <!-- -->
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</exclude>
-
+ <exclude>config/config.json</exclude>
+ <exclude>config/application.properties</exclude>
+ <exclude>config/system.properties</exclude>
<exclude>**/*.woff</exclude>
@@ -411,6 +428,7 @@
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.xls</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
@@ -439,6 +457,11 @@
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.3.0.Final</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.12</version>
</path>
</annotationProcessorPaths>
</configuration>
@@ -474,11 +497,7 @@
</repository>
- <repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
+
</repositories>
--
Gitblit v1.9.1