Merge remote-tracking branch 'origin/develop' into develop

performance/Performance.DtoModels/Request/CustomRequest.cs

@@ -31,10 +31,4 @@ public class CustomResponse
         public CustonPagingData Datas { get; set; }
     }
 
-    public class Heads
-    {
-        public string Cloumn { get; set; }
-
-        public string Name { get; set; }
-    }
 }

performance/Performance.DtoModels/Response/ComparisonResponse.cs

@@ -13,7 +13,7 @@ public class ComparisonResponse
 
     public class Heads
     {
-        public string Cloumon { get; set; }
+        public string Column { get; set; }
         public string Name { get; set; }
     }
 

performance/Performance.Services/ConfigService.cs

@@ -1951,7 +1951,7 @@ public ApiResponse QueryCustom(CustomPagingRequest request)
                 if (dic.ElementAt(0).ToString().ToLower() == "allotid")
                     continue;
                 var head = new Heads();
-                head.Cloumn = dic.ElementAt(0).ToString().ToLower();
+                head.Column = dic.ElementAt(0).ToString().ToLower();
                 head.Name = dic.ElementAt(1).ToString();
                 headList.Add(head);
             }

performance/Performance.Services/EmployeeService.cs

@@ -1117,22 +1117,22 @@ public class ComparisonConfig
     {
         public static List<Heads> DeptHeads { get; } = new List<Heads>
         {
-            new Heads{Cloumon="核算单元组别",Name=nameof(view_check_dept.UnitType)},
-            new Heads{Cloumon="核算单元",Name=nameof(view_check_dept.AccountingUnit)},
-            new Heads{Cloumon="测算表实发",Name=nameof(view_check_dept.RealGiveFeeExecl)},
-            new Heads{Cloumon="软件实发",Name=nameof(view_check_dept.RealGiveFeeCompute)},
-            new Heads{Cloumon="差额",Name=nameof(view_check_dept.Diff)},
+            new Heads{Column="核算单元组别",Name=nameof(view_check_dept.UnitType)},
+            new Heads{Column="核算单元",Name=nameof(view_check_dept.AccountingUnit)},
+            new Heads{Column="测算表实发",Name=nameof(view_check_dept.RealGiveFeeExecl)},
+            new Heads{Column="软件实发",Name=nameof(view_check_dept.RealGiveFeeCompute)},
+            new Heads{Column="差额",Name=nameof(view_check_dept.Diff)},
         };
 
         public static List<Heads> EmpHeads { get; } = new List<Heads>
         {
-            new Heads{Cloumon="核算单元组别",Name=nameof(view_check_emp.UnitType)},
-            new Heads{Cloumon="核算单元",Name=nameof(view_check_emp.AccountingUnit)},
-            new Heads{Cloumon="人员工号",Name=nameof(view_check_emp.JobNumber)},
-            new Heads{Cloumon="姓名",Name=nameof(view_check_emp.EmployeeName)},
-            new Heads{Cloumon="测算表实发",Name=nameof(view_check_emp.RealGiveFeeExecl)},
-            new Heads{Cloumon="软件实发",Name=nameof(view_check_emp.RealGiveFeeCompute)},
-            new Heads{Cloumon="差额",Name=nameof(view_check_emp.Diff)},
+            new Heads{Column="核算单元组别",Name=nameof(view_check_emp.UnitType)},
+            new Heads{Column="核算单元",Name=nameof(view_check_emp.AccountingUnit)},
+            new Heads{Column="人员工号",Name=nameof(view_check_emp.JobNumber)},
+            new Heads{Column="姓名",Name=nameof(view_check_emp.EmployeeName)},
+            new Heads{Column="测算表实发",Name=nameof(view_check_emp.RealGiveFeeExecl)},
+            new Heads{Column="软件实发",Name=nameof(view_check_emp.RealGiveFeeCompute)},
+            new Heads{Column="差额",Name=nameof(view_check_emp.Diff)},
         };
     }
 }