fixed fi bug
Merge branch 'master' of https://github.com/druidwang/Sconit
bugs
Merge branch 'master' of https://github.com/druidwang/Sconit

Conflicts:
	Sconit5/branch/Shenya/src/Core.5.0.0/Service/Impl/Mrp/PlanMgrImpl.cs