合并

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -547,6 +547,7 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\WorkStudyPositionApplyController.cs" />
     <Compile Include="Areas\PersonnelManagement\PersonnelManagementAreaRegistration.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\ReceiveSendFeeManagementAreaRegistration.cs" />
+    <Compile Include="Areas\StudentWork\Controllers\FamilyEconomyController.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_MainController.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_Main_QuestionController.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_BatchController.cs" />
@@ -1690,6 +1691,8 @@
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.js" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.js" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\Index.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerQuery.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\Form.js" />
@@ -8105,6 +8108,8 @@
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormSix.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormFiveView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.cshtml" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.cshtml" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\Index.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -534,6 +534,7 @@
     <Compile Include="EducationalAdministration\SignUpAboutTrainMap.cs" />
     <Compile Include="PersonnelManagement\StuSaveRecordMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoBasicTwoMap.cs" />
+    <Compile Include="StudentWork\FamilyEconomyMap.cs" />
     <Compile Include="StudentWork\SW_Ask_MainMap.cs" />
     <Compile Include="StudentWork\SW_Ask_Main_QuestionMap.cs" />
     <Compile Include="StudentWork\SW_Ask_BatchMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -546,6 +546,10 @@
     <Compile Include="PersonnelManagement\WorkStudyPositionApply\WorkStudyPositionApplyIBLL.cs" />
     <Compile Include="PersonnelManagement\WorkStudyPositionApply\WorkStudyPositionApplyService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StudentWork\FamilyEconomy\FamilyEconomyBLL.cs" />
+    <Compile Include="StudentWork\FamilyEconomy\FamilyEconomyEntity.cs" />
+    <Compile Include="StudentWork\FamilyEconomy\FamilyEconomyIBLL.cs" />
+    <Compile Include="StudentWork\FamilyEconomy\FamilyEconomyService.cs" />
     <Compile Include="StudentWork\SW_Ask_Main\SW_Ask_MainBLL.cs" />
     <Compile Include="StudentWork\SW_Ask_Main\SW_Ask_MainEntity.cs" />
     <Compile Include="StudentWork\SW_Ask_Main\SW_Ask_MainIBLL.cs" />