Merge branch 'v2020morge' into v2020morge-graphql

# Conflicts:
#	performance/Performance.Repository/Repository/PerforcollectdataRepository.cs
#	performance/Performance.Repository/Repository/PerforcollectpermissionRepository.cs

performance/Performance.Repository/Repository/PerforcollectdataRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" collect_data.cs">
-// * FileName: collect_data.cs
+// <copyright file=" ag_againsituation.cs">
+// * FileName: ag_againsituation.cs
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using Performance.EntityModels;
+using System;
 
 namespace Performance.Repository
 {
@@ -13,7 +13,7 @@ namespace Performance.Repository
     /// </summary>
     public partial class PerforCollectdataRepository : PerforRepository<collect_data>
     {
-		public PerforCollectdataRepository(PerformanceDbContext context) : base(context)
+        public PerforCollectdataRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Repository/Repository/PerforcollectpermissionRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" collect_permission.cs">
-// * FileName: collect_permission.cs
+// <copyright file=" ag_againsituation.cs">
+// * FileName: ag_againsituation.cs
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using Performance.EntityModels;
+using System;
 
 namespace Performance.Repository
 {
@@ -13,7 +13,7 @@ namespace Performance.Repository
     /// </summary>
     public partial class PerforCollectpermissionRepository : PerforRepository<collect_permission>
     {
-		public PerforCollectpermissionRepository(PerformanceDbContext context) : base(context)
+        public PerforCollectpermissionRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Services/CollectService.cs

@@ -26,8 +26,8 @@ public class CollectService : IAutoInjection
         private readonly PerforImemployeeRepository perforImEmployeeRepository;
         private readonly PerforImemployeeclinicRepository perforImemployeeclinicRepository;
         private readonly PerforImemployeelogisticsRepository perforImemployeelogisticsRepository;
-        private readonly PerforcollectdataRepository perforcollectdataRepository;
-        private readonly PerforcollectpermissionRepository perforcollectpermissionRepository;
+        private readonly PerforCollectdataRepository perforcollectdataRepository;
+        private readonly PerforCollectpermissionRepository perforcollectpermissionRepository;
         private readonly PerforUserroleRepository userroleRepository;
         private readonly PerforImaccountbasicRepository perforImaccountbasicRepository;
         private readonly SheetSevice sheetSevice;
@@ -42,8 +42,8 @@ public class CollectService : IAutoInjection
             PerforImemployeeRepository perforImEmployeeRepository,
             PerforImemployeeclinicRepository perforImemployeeclinicRepository,
             PerforImemployeelogisticsRepository perforImemployeelogisticsRepository,
-            PerforcollectdataRepository perforcollectdataRepository,
-            PerforcollectpermissionRepository perforcollectpermissionRepository,
+            PerforCollectdataRepository perforcollectdataRepository,
+            PerforCollectpermissionRepository perforcollectpermissionRepository,
             PerforUserroleRepository userroleRepository,
             PerforImaccountbasicRepository perforImaccountbasicRepository,
             SheetSevice sheetSevice,

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -20,7 +20,7 @@ public class ExtractService : IAutoInjection
         private readonly PerSheetService perSheetService;
         private readonly DictionaryService dictionaryService;
         private readonly PerforPerallotRepository perallotRepository;
-        private readonly PerforcollectdataRepository collectdataRepository;
+        private readonly PerforCollectdataRepository collectdataRepository;
         private readonly PerforPeremployeeRepository peremployeeRepository;
         private readonly PerforPerdeptdicRepository perdeptdicRepository;
 
@@ -32,7 +32,7 @@ public class ExtractService : IAutoInjection
             PerSheetService perSheetService,
             DictionaryService dictionaryService,
             PerforPerallotRepository perallotRepository,
-            PerforcollectdataRepository collectdataRepository,
+            PerforCollectdataRepository collectdataRepository,
             PerforPeremployeeRepository peremployeeRepository,
             PerforPerdeptdicRepository perdeptdicRepository
             )