From dab190364a9c8b341cfa399ddc2e5d6cb76fb394 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 十一月 2022 15:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/.gitignore b/.gitignore
index 14fcf85..9c0164d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
 /LMES/obj/Release
 /LMES/obj/x86/Debug
 /MES/bin/x86/Debug
+/MES/bin/Debug
 /MES/obj/Debug
 /MES/obj/Release
 /MES/obj/x86/Debug
@@ -126,5 +127,18 @@
 /WorkM/obj/Release
 /WorkM/obj/x86/Debug
 /WorkM/obj/x86/Release
-/DBUtility/bin/x86/Debug
-/DBUtility/obj/x86/Debug
\ No newline at end of file
+/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
+/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+/NETERPNoWin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+/NETERPNoWin/bin/Debug
+/NETERPNoWin/obj/Debug
+/WebAPI/Sc_MouldProdInBill/Log
+/WebAPI/Vlog
+/PayM/obj/x86/Release
+/PayM/obj/Release
+/PayM/obj/Debug
+/NETERPNoWin/obj
+/WebAPI/Sc_MouldProdOutBill/Log
+/PayM/bin/Debug
+/PayM/obj/x86/Debug

--
Gitblit v1.9.1