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

diff --git a/.gitignore b/.gitignore
index 8365624..4cccf84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,22 +2,22 @@
 *.o
 *.a
 *.so
-
 # Folders
 _obj
 _test
-
 # Architecture specific extensions/prefixes
 *.[568vq]
 [568vq].out
-
 *.cgo1.go
 *.cgo2.c
 _cgo_defun.c
 _cgo_gotypes.go
 _cgo_export.*
-
 _testmain.go
-
 *.exe
 *.test
+/logs/aps-admin.info.log
+/logs/aps-admin.err.log
+apsCrm
+.idea/*
+/aps_crm
\ No newline at end of file

--
Gitblit v1.8.0