diff --git a/src/AbpDesk/AbpDesk.UI/AppModule.cs b/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs similarity index 92% rename from src/AbpDesk/AbpDesk.UI/AppModule.cs rename to src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs index 59ea207782..c04eb85db0 100644 --- a/src/AbpDesk/AbpDesk.UI/AppModule.cs +++ b/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs @@ -10,10 +10,10 @@ using Volo.Abp.Modularity; namespace AbpDesk { - //TODO: Rename project to AbpDesk.Web.Mvc & rename to AbpDeskWebAppModule + //TODO: Rename project to AbpDesk.Web.Mvc [DependsOn(typeof(AbpAspNetCoreMvcModule), typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule))] - public class AppModule : AbpModule + public class AbpDeskWebAppModule : AbpModule { public override void ConfigureServices(IServiceCollection services) { diff --git a/src/AbpDesk/AbpDesk.UI/Startup.cs b/src/AbpDesk/AbpDesk.UI/Startup.cs index 4fc62c553b..12d379b6d0 100644 --- a/src/AbpDesk/AbpDesk.UI/Startup.cs +++ b/src/AbpDesk/AbpDesk.UI/Startup.cs @@ -9,7 +9,7 @@ namespace AbpDesk { public void ConfigureServices(IServiceCollection services) { - services.AddApplication(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs index 90e683f0b5..8958580e9f 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Repositories/EntityFrameworkCore/EfCoreRepository.cs @@ -46,6 +46,8 @@ namespace Volo.Abp.Repositories.EntityFrameworkCore return entity; } + //TODO: Find by multiple primary key + public override TEntity Find(TPrimaryKey id) { return DbSet.Find(id);