合并冲突

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -412,7 +412,7 @@ namespace Business.ResourceExamineManagement
             ISqlRepository<ShopCalendarWorkCtr> shopCalendarWorkCtr,
             ISqlRepository<QualityLineWorkDetail> qualityLineWorkDetail,
             ISqlRepository<HolidayMaster> holidayMaster,
-            ProductExamineAppService productExamineAppService
+            ProductExamineAppService productExamineAppService,
             ISqlRepository<rf_serialnumber> rf_serialnumber,
             ISqlRepository<LocationDetail> locationDetail,
             ISqlRepository<ItemPackMaster> itemPackMaster
@@ -495,9 +495,8 @@ namespace Business.ResourceExamineManagement
             _qualityLineWorkDetail = qualityLineWorkDetail;
             _holidayMaster = holidayMaster;
             _productExamineAppService= productExamineAppService;
-    }
-            _locationDetail=locationDetail;
-            _itemPackMaster= itemPackMaster;
+            _locationDetail = locationDetail;
+            _itemPackMaster = itemPackMaster;
         }
         #endregion