From d574705357af4e7714bd64a1fac571c2b42a3fa2 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 12 七月 2022 18:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2826bd..ce42008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,6 @@
 /WorkM/obj/x86/Debug
 /WorkM/obj/x86/Release
 /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

--
Gitblit v1.9.1