Merge branch 'master' of http://git.tiobon.com/Simon/Tiobon.Web.Core

Tiobon.Core.Services/CommonServices.cs

@@ -2438,6 +2438,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
 
                 break;
             case "F_PerformancePeriodType":
+            case "F_GhraStaffGroup":
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD1YN";
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();

Tiobon.Core/Tiobon.Core.Model.xml

@@ -1229,7 +1229,7 @@
             字段
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffGroupDetailBase.InNot">
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffGroupDetailBase.Operator">
             <summary>
             包含/不包含
             </summary>
@@ -8130,6 +8130,11 @@
             是否发放学分
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.CompleteStatus">
+            <summary>
+            完成状态
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailBase">
             <summary>
             培训记录明细 (Dto.Base)
@@ -19874,7 +19879,7 @@
             字段
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffGroupDetail.InNot">
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffGroupDetail.Operator">
             <summary>
             包含/不包含
             </summary>
@@ -26672,6 +26677,11 @@
             是否发放学分
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.CompleteStatus">
+            <summary>
+            完成状态
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetail">
             <summary>
             培训记录明细 (Model)

Tiobon.Core/Tiobon.Core.xml

@@ -688,6 +688,12 @@
             人员群组(Controller)
             </summary>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghra_StaffGroupController.GetStaffInfoColumnData(System.String)">
+            <summary>
+            获取配置
+            </summary> 
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghra_StaffGroupDetailController">
             <summary>
             人员群组明细(Controller)