Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2022-07-28 acb7c8de21c66ded398cc52a9e6be712b85d50e8

 .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,9 @@
/WorkM/obj/Release
/WorkM/obj/x86/Debug
/WorkM/obj/x86/Release
/DBUtility/bin/x86/Debug
/DBUtility/obj/x86/Debug
/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