加入邵梦能耗总耗图，加入张新重点能耗监控
Merge branch 'master' of https://github.com/nxjcproject/nxjcslim

Conflicts:
	NXJCSlim/NXJC.UI.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache