Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -434,7 +434,7 @@ namespace Learun.Application.Web.Controllers
 
             #region 待办
             var userinfo = LoginUserInfo.Get();
-            Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
+            Pagination paginationobj = new Pagination() { rows = 100, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
             //未读邮件
             ViewBag.UnreadMail = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userinfo.userId + "\"}").Count(m => m.READFLAG == 0);
             //办公事项

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktopTop.cshtml

@@ -314,7 +314,7 @@
         .lr-scroll-wrap {
             position: relative;
             overflow: hidden;
-            height: 100%;
+            height: 70%;
             width: 100%
         }