From 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 12:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

---
 .gitignore |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 416ef8b..f73120d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -375,7 +375,7 @@
 /WebApplication1/Properties/AssemblyInfo.cs
 /WebApplication1/packages.config
 /鍓嶇娴嬭瘯鏂囦欢/checkOrder
-/My_Admin.NET_Template_Wms/Admin.NET.Web.Entry/wwwroot/Upload
+/iWare_RawMaterialWarehouse/Admin.NET.Web.Entry/wwwroot/Upload
 # 蹇界暐鐨勬枃浠�
 /Admin.NET.Web.Entry/wwwroot/Upload
 /bin
@@ -386,10 +386,10 @@
 /Debug
 /bin/Release
 /Release
-/My_Admin.NET_Template_Wms/Admin.NET.Database.Migrations/Migrations
-/My_Admin.NET_Template_Wms/Admin.NET.Database.Migrations/Migrations
-/My_Admin.NET_Template_Wms/Admin.NET.Web.Entry/wwwroot/CodeGen
-/My_Admin.NET_Template_Wms/Admin.NET.Application/Admin.NET.Application.xml
+/iWare_RawMaterialWarehouse/Admin.NET.Database.Migrations/Migrations
+/iWare_RawMaterialWarehouse/Admin.NET.Database.Migrations/Migrations
+/iWare_RawMaterialWarehouse/Admin.NET.Web.Entry/wwwroot/CodeGen
+/iWare_RawMaterialWarehouse/Admin.NET.Application/Admin.NET.Application.xml
 /浣跨敤鏂囨。/PDManer鏂囦欢/.back_My_Admin
 /iWare_RawMaterialWarehouse_Wms/Admin.NET.Database.Migrations/Migrations
 /浣跨敤鏂囨。/PDManer鏂囦欢/.back_鍘熸潗鏂欏簱鏍囧噯鍖�

--
Gitblit v1.9.3