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 |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45a6997..4b75bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,22 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.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
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.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/*

--
Gitblit v1.8.0