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

yangle

2022-09-15 ef74ca1a145013f325af41ecde9a4de3f5b158d8

 .gitignore

@@ -128,3 +128,15 @@
/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
/NETERPNoWin/bin/Debug
/NETERPNoWin/obj/Debug
/WebAPI/Sc_MouldProdInBill/Log
/WebAPI/Vlog
/PayM/obj/x86/Release
/PayM/obj/Release
/PayM/obj/Debug
/NETERPNoWin/obj
/WebAPI/Sc_MouldProdOutBill/Log