[merge] merge and resolve conflict by tiezhu.

Author: FlechazoW

core/src/main/java/com/dtstack/flink/sql/table/AbstractTableInfo.java

@@ -20,14 +20,14 @@
 
 import com.dtstack.flink.sql.dirtyManager.manager.DirtyKeys;
 import com.dtstack.flink.sql.outputformat.AbstractDtRichOutputFormat;
+import com.dtstack.flink.sql.side.AbstractSideTableInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Properties;
 
 /**
  * Reason: