소스 검색

合并冲突

Murphy 3 년 전
부모
커밋
05cf39beee
1개의 변경된 파일과 3개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 4
      MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

+ 3 - 4
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