From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index faec672..091cb8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 */node_modules
 /web_standard/web
 /web_standard/doumeeplant_web
-/web_standard/.vscode
\ No newline at end of file
+/web_standard/.vscode
+.idea

--
Gitblit v1.9.3