切换到本地dan_userOrder
生成
2013-11-15
good
11月18日，修改的底层类的构架
Merge branch 'dan_home' of y: into dan_userOrder

Conflicts:
	UnitTestProject_estay/obj/Debug/UnitTestProject_estay.dll
	We7.CMS.DLL/FakesAssemblies/We7.CMS.Utils.Fakes.dll
	We7.CMS.DLL/obj/Debug/Fakes/fakes.args
	We7.CMS.DLL/obj/Debug/Fakes/w7cmsu/f.ah
	We7.CMS.DLL/obj/Debug/Fakes/w7cmsu/f.ch
	We7.CMS.DLL/obj/Debug/Fakes/w7cmsu/f.cs
	We7.CMS.DLL/obj/Debug/Fakes/w7cmsu/f.fakes
	We7.CMS.Web/Admin/Bin/Thinkment.Data.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.Accounts.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.Common.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.Config.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.Linq.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.UI.dll
	We7.CMS.Web/Admin/Bin/We7.CMS.Utils.dll
	We7.CMS.Web/Admin/Bin/We7.Framework.dll
	We7.CMS.Web/Admin/Bin/We7.Model.Core.dll
	We7.CMS.Web/Admin/obj/Debug/We7.CMS.Web.Admin.dll
	We7.CMS.Web/ModelUI/bin/Thinkment.Data.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.Accounts.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.Common.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.Config.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.DLL.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.Linq.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.UI.dll
	We7.CMS.Web/ModelUI/bin/We7.CMS.Utils.dll
	We7.CMS.Web/ModelUI/bin/We7.Framework.dll
	We7.CMS.Web/ModelUI/bin/We7.Model.Core.dll
	We7.CMS.Web/ModelUI/bin/We7.Model.UI.dll
	We7.CMS.Web/ModelUI/obj/Debug/We7.Model.UI.dll
	We7.CMS.Web/User/bin/Estay_Ecs.Data.Service.dll
	We7.CMS.Web/User/bin/Thinkment.Data.dll
	We7.CMS.Web/User/bin/We7.CMS.Accounts.dll
	We7.CMS.Web/User/bin/We7.CMS.Common.dll
	We7.CMS.Web/User/bin/We7.CMS.Config.dll
	We7.CMS.Web/User/bin/We7.CMS.DLL.dll
	We7.CMS.Web/User/bin/We7.CMS.Install.dll
	We7.CMS.Web/User/bin/We7.CMS.Linq.dll
	We7.CMS.Web/User/bin/We7.CMS.UI.dll
	We7.CMS.Web/User/bin/We7.CMS.Utils.dll
	We7.CMS.Web/User/bin/We7.CMS.Web.Admin.dll
	We7.CMS.Web/User/bin/We7.CMS.Web.User.dll
	We7.CMS.Web/User/bin/We7.Framework.dll
	We7.CMS.Web/User/bin/We7.Model.Core.dll
	We7.CMS.Web/User/bin/We7.Model.UI.dll
	We7.CMS.Web/User/obj/Debug/We7.CMS.Web.User.dll
	We7.CMS.Web/obj/Debug/We7.CMS.Web.dll
18 startWork
dan_home
Merge branch 'dan_home' into dan_userOrder
UP DB  roomstatemanger is ok . /edit db backup project