添加画面中英文字典
添加工序能耗报警设置，添加电气室电表监控
Merge branch 'master' of https://github.com/nxjcproject/nxjcslim

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