整合开关量技术实现原型
Merge branch 'master' of https://github.com/nxjcproject/nxjc

Conflicts:
	NXJC/NXJC.Infrastructure/obj/Debug/NXJC.Infrastructure.csproj.FileListAbsolute.txt
	NXJC/NXJC.Repository.MsSql/obj/Debug/NXJC.Repository.csproj.FileListAbsolute.txt
	NXJC/NXJC.UI.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache