From 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:45:49 +0800
Subject: [PATCH] Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

---
 zq-erp/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zq-erp/.gitignore b/zq-erp/.gitignore
index 2742ce7..7f64141 100644
--- a/zq-erp/.gitignore
+++ b/zq-erp/.gitignore
@@ -25,6 +25,7 @@
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
+*/resources/generated-sources/*
 # Gradle:
 .idea/gradle.xml
 .idea/

--
Gitblit v1.9.1