diff --git a/code/.gitignore b/code/.gitignore
index 70a3f6dd..4e191f0f 100644
--- a/code/.gitignore
+++ b/code/.gitignore
@@ -1,24 +1,5 @@
-<<<<<<< HEAD
-################################################################################
-# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
-################################################################################
-
-/src/.vs/SettleAccount/DesignTimeBuild/.dtbcache.v2
-/.vs/slnx.sqlite
-/src/.vs/SmartFactorySuite/DesignTimeBuild/.dtbcache.v2
-/src/.vs/SmartFactorySuite/v16/.suo
-/src/.vs/SettleAccount/v16/.suo
-
-
-/*.rar
-/src/Shared
-/.vs/Win.Sfs.SmartSettlementSystem.PG/v17/.suo
-/src/.vs/SettleAccount/v17/.suo
-/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220226.txt
-/src/.vs/SettleAccount/v17/.futdcache.v1
-/src/.vs/SettleAccount/v17/fileList.bin
-=======
 *.bak
+*.log
 
 #fe
 node_modules/
@@ -26,12 +7,13 @@ dist/
 
 #be
 .vs/
-bin
-obj
+bin/
+obj/
+[Ll]og/
+[Ll]ogs/
 *.suo
 *.user
 *.db
 *.db-shm
 *.db-wal
 
->>>>>>> c0f08a7ed0ffc663a2852d4c0da54a983f033a2f