提交代码冲突

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionServiceImpl.java

@@ -12,10 +12,8 @@ import com.unis.reserveLayout.modular.qualityInspectionOrg.entity.BusinessQcQual
 import com.unis.reserveLayout.modular.qualityInspectionOrg.entity.BusinessQcQualityInspectionItem;
 import com.unis.reserveLayout.modular.qualityInspectionOrg.mapper.QualityInspectionItemMapper;
 import com.unis.reserveLayout.modular.qualityInspectionOrg.mapper.QualityInspectionMapper;
-<<<<<<< HEAD
+
 import com.unis.reserveLayout.modular.qualityInspectionOrg.param.FoodQualityInspectionPageParam;
-=======
->>>>>>> dev
 import com.unis.reserveLayout.modular.qualityInspectionOrg.param.QualityInspectionPageParam;
 import com.unis.reserveLayout.modular.qualityInspectionOrg.param.QualityInspectionReportPageParam;
 import com.unis.reserveLayout.modular.qualityInspectionOrg.service.QualityInspectionService;