From ca982eb586579947e6fcfc0b6a2231b3c29fc91b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 11:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' 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