瀏覽代碼

合并

master
zhangli 3 年之前
父節點
當前提交
fd3d0d1590
共有 4 個文件被更改,包括 3937 次插入4315 次删除
  1. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  2. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
  3. +3927
    -4315
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
  4. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj 查看文件

@@ -806,6 +806,7 @@
<Compile Include="Areas\PersonnelManagement\Controllers\ReleaseMettingController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\StudyGuideController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\ResourceImportController.cs" />
<Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_CollectManageController.cs" />
<Compile Include="Areas\CustomFunction\Controllers\SRProjectLevelController.cs" />
<Compile Include="Areas\CustomFunction\Controllers\SRProjectTypeController.cs" />
</ItemGroup>
@@ -6375,6 +6376,10 @@
<Content Include="Areas\PersonnelManagement\Views\ResourceImport\Index.js" />
<Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.js" />
<Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Index.cshtml" />
<Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Index.js" />
<Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Form.cshtml" />
<Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Form.js" />
<Content Include="Areas\CustomFunction\Views\SRProjectLevel\Index.cshtml" />
<Content Include="Areas\CustomFunction\Views\SRProjectLevel\Index.js" />
<Content Include="Areas\CustomFunction\Views\SRProjectLevel\Form.cshtml" />


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj 查看文件

@@ -559,6 +559,7 @@
<Compile Include="PersonnelManagement\ReleaseMettingMap.cs" />
<Compile Include="PersonnelManagement\StudyGuideMap.cs" />
<Compile Include="PersonnelManagement\ResourceImportMap.cs" />
<Compile Include="LR_Desktop\SSO_Drag_CollectManageMap.cs" />
<Compile Include="CustomFunction\SRProjectLevelMap.cs" />
<Compile Include="CustomFunction\SRProjectTypeMap.cs" />
</ItemGroup>


+ 3927
- 4315
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
文件差異過大導致無法顯示
查看文件


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj 查看文件

@@ -1662,6 +1662,10 @@
<Compile Include="CustomFunction\SRProjectType\SRProjectTypeService.cs" />
<Compile Include="CustomFunction\SRProjectType\SRProjectTypeBLL.cs" />
<Compile Include="CustomFunction\SRProjectType\SRProjectTypeIBLL.cs" />
<Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageEntity.cs" />
<Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageService.cs" />
<Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageIBLL.cs" />
<Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageBLL.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">


Loading…
取消
儲存