搜索
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
修改了几个文字
Merge branch 'develop' of http://git.estay.cn/MobileInterface into develop
update
管家服务接口
管家服务接口优化
update
update 添加点评DAO的注释
       效验以房型为单元的点评
Merge branch 'butlerservice' of http://git.estay.cn/MobileInterface into feature/PriceInDay

Conflicts:
	MvcInerfaceDemo/MvcInerfaceDemo/MvcInerfaceDemo.csproj
	MvcInerfaceDemo/MvcInerfaceDemo/MvcInerfaceDemo.csproj.user
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer13.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/Reference.svcmap
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.Context.cs
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.edmx
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.edmx.diagram
	WcfServiceMobileInterface/WcfServiceMobileInterface/WcfServiceMobileInterface.csproj.user
管家服务接口优化
update
Merge branch 'butlerservice' of http://git.estay.cn/MobileInterface into feature/PriceInDay

Conflicts:
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.edmx
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.edmx.diagram
	WcfServiceMobileInterface/WcfServiceMobileInterface/WcfServiceMobileInterface.csproj.user
update