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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -130,7 +130,7 @@ var bootstrap = function ($, learun) {
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
             //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });
+            $('#PostRank').lrDataItemSelect({ code: 'PostRank', allowSearch: true });
             $('#Photo').lrUploader();
             //最高学历
             $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml

@@ -7,7 +7,7 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
             <div class="lr-layout-body">
                 <ul class="lr-left-list" id="lr_left_list">
-                    <li data-value="allFile" class="lrlt active">所有文件</li>
+                    <li data-value="allFile" class="lrlt active">所有文件/文件夹</li>
                     <li data-value="allDocument" class="lrlt">文档</li>
                     <li data-value="allImage" class="lrlt">图片</li>
                     <li data-value="recycledFile" class="lrlt">回收站</li>