From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Jun 2021 21:57:50 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/pom.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml index 3bdc5c1..111a11a 100644 --- a/zq-erp/pom.xml +++ b/zq-erp/pom.xml @@ -401,12 +401,12 @@ <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> -- Gitblit v1.9.1