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

jhz

2022-07-26 1f49f98a07ae1c31a1967c5c36b382d6c855becd

 .gitignore

@@ -128,3 +128,7 @@
/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
/WebAPI