From c76890a550f386a52a7111e3d87242ab35af5b41 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 28 Nov 2021 16:15:51 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha
---
zq-erp/pom.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 661933d..a4dbca9 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>
@@ -412,7 +417,7 @@
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
- -->
+-->
<exclude>**/*.woff</exclude>
--
Gitblit v1.9.1