Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js

@@ -182,7 +182,7 @@ var bootstrap = function ($, learun) {
             $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' });
             $('#RecruitWay').lrDataItemSelect({ code: 'RecruitWay' });
             $('#RecruitCooperateType').lrDataItemSelect({ code: 'RecruitCooperateType' });
-            $('#StuOrigin').lrDataItemSelect({ code: 'AdmissionsDataSource' });
+            $('#StuOrigin').lrDataItemSelect({ code: 'StuOrigin' });
             $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' });
             $('#RecruitCooperateForm').lrDataItemSelect({ code: 'RecruitCooperateForm' });
             $('#MajorDetailNo').lrDataItemSelect({ code: 'MajorDetail' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs

@@ -222,7 +222,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 }
             }
             Response.ClearContent();
-            switch (data.F_FileType)
+            switch (data.F_FileType.ToLower())
             {
                 case "jpg":
                     Response.ContentType = "image/jpeg";