冲突

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

@@ -362,8 +362,10 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachPlanController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachSwitchController.cs" />
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\Acc_DormitoryRuleController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\DormitoryReturnController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterIPController.cs" />
@@ -1044,14 +1046,17 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\Monitor.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpass.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Monitor.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\AllStuScoreQueryIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreQueryIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\InputScoreIndexOfElectiveInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\InputScoreIndexOfElective.js" />
@@ -1059,6 +1064,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\GraduateScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElective\QueryStuSelectResultForTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
@@ -1224,6 +1230,16 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachSwitch\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClass.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
@@ -1231,6 +1247,11 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormOut.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormReturn.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\IndexReport.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.js" />
@@ -1474,6 +1495,7 @@
     <Content Include="Areas\PersonnelManagement\Views\TeacherCancelLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherOvertimeManagement\FormView.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\ClassIndexInEducation.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\CheckIndex.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />