From 1b8811fe5024ad4e2d744a98dc9a49d65bb87a3b Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 16 八月 2023 09:40:19 +0800
Subject: [PATCH] Merge branch 'master' into fly

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

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

--
Gitblit v1.8.0