2014Data

2014Data

Signed-off-by: fuwei <756091180@qq.com>
Merge branch 'CRM' of https://github.com/fuwei199006/CRM2014 into CRM

Conflicts:
	Work/Com.ArHat/Com.ArHat.BLL/obj/Debug/Com.ArHat.BLL.csprojResolveAssemblyReference.cache
	Work/Com.ArHat/Com.ArHat.BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.DAL/obj/Debug/Com.ArHat.DAL.csprojResolveAssemblyReference.cache
	Work/Com.ArHat/Com.ArHat.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.IBLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.IDAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.Register/obj/Debug/Com.ArHat.Register.csprojResolveAssemblyReference.cache
	Work/Com.ArHat/Com.ArHat.Register/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Work/Com.ArHat/Com.ArHat.Test.v11.suo