From 9f10609773b45b26c709513f718d0783b19d5cda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:41:20 +0800
Subject: [PATCH] 合并代码
---
zq-erp/pom.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 8f383be..a25e047 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -160,7 +160,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
-
+ -->
<dependency>
@@ -401,11 +401,11 @@
<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>
--
Gitblit v1.9.1