From 16bb2f7b48cf2c3cfbb6a026c265d4e52d22eca4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/.gitignore b/.gitignore
index 14fcf85..365c632 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,17 @@
 /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

--
Gitblit v1.9.1