From 12990a5138e3fa8874a601bfb784a2b1147f0f24 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 06 Apr 2021 11:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/.gitignore b/zq-erp/.gitignore
index 2742ce7..31966d8 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/
@@ -75,4 +76,5 @@
 .project
 .classpath
 .settings
-.metadata
\ No newline at end of file
+.metadata
+.gitignore
\ No newline at end of file

--
Gitblit v1.9.1