From 8c7508388bad1234b731e0fc59afa095db0fda1b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 16 May 2021 06:24:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/.gitignore b/zq-erp/.gitignore
index 7f64141..31966d8 100644
--- a/zq-erp/.gitignore
+++ b/zq-erp/.gitignore
@@ -76,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