# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/collect_permission.cs
#	performance/Performance.EntityModels/Entity/his_data.cs
#	performance/Performance.EntityModels/Entity/report_global.cs
#	performance/Performance.EntityModels/Entity/res_account.cs
#	performance/Performance.EntityModels/Entity/sys_hospital.cs
#	performance/Performance.Repository/Repository/PerforHisdataRepository.cs
#	performance/Performance.Services/ReportGlobalService.cs