Skip to content

E
Education
Commit 0ee5464f authored by 吴春's avatar 吴春
Browse files
Options

解决冲突

parents aa549f38 24edb3f3
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
Edu.Module.User/PostModule.cs
View file @ 0ee5464f
......@@ -26,7 +26,6 @@ namespace Edu.Module.User
public List<RB_Post_ViewModel> GetPostPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Post_ViewModel query)
{
var list = postRepository.GetPostPageListRepository(pageIndex, pageSize, out rowsCount, query);
string st = "";
return list;
}
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 0ee5464f
......@@ -59,17 +59,17 @@ namespace Edu.WebApi.Controllers.User
/// <summary>
/// 岗位处理类对象
/// </summary>
private readonly PostModule postModule = AOPHelper.CreateAOPObject<PostModule>();
private readonly PostModule1 postModule = AOPHelper.CreateAOPObject<PostModule1>();
/// <summary>
/// 部门处理类对象
/// </summary>
private readonly DepartmentModule departmentModule = AOPHelper.CreateAOPObject<DepartmentModule>();
private readonly DepartmentModule1 departmentModule = AOPHelper.CreateAOPObject<DepartmentModule1>();
/// <summary>
/// 员工处理类对象
/// </summary>
private readonly EmployeeModule employeeModule = new EmployeeModule();
private readonly EmployeeModule1 employeeModule = new EmployeeModule1();
#region 用户账户管理
......
education.sln
View file @ 0ee5464f
......@@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unity", "Unity", "{52C9E4CB
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Module", "Module", "{7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.User", "Edu.Module.User\Edu.Module.User.csproj", "{1B9D7825-26A9-4F81-B04C-2261CB1F954A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.WebApi", "Edu.WebApi\Edu.WebApi.csproj", "{878A03A7-2571-4322-A55E-39A5105296A9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.System", "Edu.Module.System\Edu.Module.System.csproj", "{CBA4F637-BB41-4281-BCE8-4BB9BBA3193F}"
......@@ -35,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{297A2A6E-5
Edu.WebApi\Dockerfile = Edu.WebApi\Dockerfile
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.User", "Edu.Module.User\Edu.Module.User.csproj", "{AD259CCC-048A-4F65-A368-91B8B4A9F200}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -61,10 +61,6 @@ Global
{539496B1-1377-46AD-A1AB-4473818D6A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
{539496B1-1377-46AD-A1AB-4473818D6A79}.Release|Any CPU.ActiveCfg = Release|Any CPU
{539496B1-1377-46AD-A1AB-4473818D6A79}.Release|Any CPU.Build.0 = Release|Any CPU
{1B9D7825-26A9-4F81-B04C-2261CB1F954A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B9D7825-26A9-4F81-B04C-2261CB1F954A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B9D7825-26A9-4F81-B04C-2261CB1F954A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B9D7825-26A9-4F81-B04C-2261CB1F954A}.Release|Any CPU.Build.0 = Release|Any CPU
{878A03A7-2571-4322-A55E-39A5105296A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{878A03A7-2571-4322-A55E-39A5105296A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{878A03A7-2571-4322-A55E-39A5105296A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -81,6 +77,10 @@ Global
{F3E4D4C5-FD08-44DE-AB65-850071BE7FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F3E4D4C5-FD08-44DE-AB65-850071BE7FEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F3E4D4C5-FD08-44DE-AB65-850071BE7FEF}.Release|Any CPU.Build.0 = Release|Any CPU
{AD259CCC-048A-4F65-A368-91B8B4A9F200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD259CCC-048A-4F65-A368-91B8B4A9F200}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD259CCC-048A-4F65-A368-91B8B4A9F200}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD259CCC-048A-4F65-A368-91B8B4A9F200}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -91,10 +91,10 @@ Global
{86EE3937-F10B-4B52-94DC-D9924C69C5DA} = {52C9E4CB-A475-4232-95A3-4508B6592AC7}
{414497FE-79E2-493F-A7B4-97BEDA956472} = {94CECEE0-E28C-424A-9C8E-8AAE9E4967BD}
{539496B1-1377-46AD-A1AB-4473818D6A79} = {94CECEE0-E28C-424A-9C8E-8AAE9E4967BD}
{1B9D7825-26A9-4F81-B04C-2261CB1F954A} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{CBA4F637-BB41-4281-BCE8-4BB9BBA3193F} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{3B21886D-A9E1-4C74-85B4-7740935AF791} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{F3E4D4C5-FD08-44DE-AB65-850071BE7FEF} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{AD259CCC-048A-4F65-A368-91B8B4A9F200} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8763B446-FAB1-46BF-9743-F2628533241B}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment