From f5e2c16e70ef2fa62ba2daa1addefe7720dadf13 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 20:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.8.0