From 21465c793eb6f703c62fd238a8f7e185020350fa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Dec 2021 11:16:18 +0800
Subject: [PATCH] merge score_shop
---
zq-erp/pom.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 3589174..4049589 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -393,6 +393,11 @@
<artifactId>hutool-all</artifactId>
<version>5.3.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>26.0-jre</version>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -408,12 +413,10 @@
<exclude>config/xcx/*</exclude>
<exclude>config/xcshop/*</exclude>
- <!---->
-
+ <!-- -->
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
-
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
@@ -497,11 +500,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