From eaad3c9d48cf9641726818c90741942b193484e2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:08:18 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/pom.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 3f8dd9a..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>
@@ -409,11 +414,9 @@
<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>
--
Gitblit v1.9.1