From 167f51d3007f5af23d457c8713b1aae7418f1afd Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 11:39:31 +0800
Subject: [PATCH] Merge branch 'master' into fly

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

diff --git a/.gitignore b/.gitignore
index c554c92..4b75bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@
 *.test
 /logs/aps-admin.info.log
 /logs/aps-admin.err.log
-/apsCrm
\ No newline at end of file
+apsCrm
+.idea/*

--
Gitblit v1.8.0