[cdc] clean code

Author: 李鹏程

paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/format/AbstractJsonRecordParser.java

@@ -124,13 +124,7 @@ protected List<String> extractPrimaryKeys() {
     protected void processRecord(
             JsonNode jsonNode, RowKind rowKind, List<RichCdcMultiplexRecord> records) {
         RowType.Builder rowTypeBuilder = RowType.builder();
-<<<<<<< HEAD
-        Map<String, String> rowData = this.extractRowData(jsonNode, rowTypeBuilder);
-        evalComputedColumns(rowKind, rowData, rowTypeBuilder);
-=======
         Map<String, String> rowData = this.extractRowData(rowKind, jsonNode, rowTypeBuilder);
-
->>>>>>> 1e76b3018 ([cdc] Support audit time during cdc by computed columns)
         records.add(createRecord(rowKind, rowData, rowTypeBuilder.build().getFields()));
     }
 

paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/format/debezium/DebeziumAvroRecordParser.java

@@ -158,10 +158,7 @@ private Map<String, String> extractRowData(
             rowTypeBuilder.field(fieldName, avroToPaimonDataType(schema));
         }
 
-<<<<<<< HEAD
-=======
         evalComputedColumns(rowKind, resultMap, rowTypeBuilder);
->>>>>>> 1e76b3018 ([cdc] Support audit time during cdc by computed columns)
         return resultMap;
     }