把bin和obj加入了忽略列表
99
分支第一次提交
添加了EstayControls
加入 page和control的基类
home
准备迭代版本，加入linq的测试
本地dan_userOrder合并到开发版
after pull
合并后运行一次
Merge branch 'develop' of http://202.104.150.119:8082/estay_ecs into develop

Conflicts:
	.gitignore
	Estay_Ecs_interfaces/obj/Debug/Estay_Ecs_interfaces.csproj.FileListAbsolute.txt
	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.csproj
	We7.CMS.DLL/obj/Debug/Fakes/w7cmsu/f.fakes
	We7.CMS.Linq/obj/Debug/We7.CMS.Linq.csproj.FileListAbsolute.txt
	We7.CMS.Web/Admin/Bin/Estay_Ecs.Data.Service.dll
	We7.CMS.Web/Admin/Bin/Estay_Ecs.Domain.dll
	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.DLL.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/Bin/We7.Model.UI.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.Admin.xml
	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/bin/We7.CMS.Web.Admin.XML
	We7.CMS.Web/obj/Debug/We7.CMS.Web.dll