From dd13c9fb53fdfbfc6f908dd497b4f51d5b8d28c9 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 11:42:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .gitignore |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e37bd72..3ba1c88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,7 @@
 
 # Users Environment Variables
 .lock-wscript
-
-package-lock.json
\ No newline at end of file
+.DS_Store
+package-lock.json
+.idea
+/dist

--
Gitblit v1.8.0