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

yangle

2022-07-25 061a166a87fd30ae6a4e61785e3c36a1c313f8a6

 .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