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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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

--
Gitblit v1.8.0