From ee19f6a51bf7d076142f7cbdddde5ddf9fe1ad34 Mon Sep 17 00:00:00 2001
From: ChengJie1053 <18033291053@163.com>
Date: Thu, 3 Aug 2023 15:26:10 +0800
Subject: [PATCH] Resolving code conflicts

---
 .../linkis/engineconnplugin/flink/operator/KillOperator.scala    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala
index 1eb38b5f7b..1a917526b1 100644
--- a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala
+++ b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala
@@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.api.records.{ApplicationId, FinalApplicationStatus
 
 import java.util
 
+import scala.collection.JavaConverters.collectionAsScalaIterableConverter
 import scala.collection.mutable
 
 class KillOperator extends Operator with Logging {