Resolve conflicts

Signed-off-by: yuxiqian <[email protected]>

Author: yuxiqian

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-postgres/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresFullTypesITCase.java

@@ -286,7 +286,7 @@ public void testTimeTypesWithTemporalModeAdaptive() throws Exception {
         Object[] expectedSnapshot =
                 new Object[] {
                     2,
-                    18460,
+                    DateData.fromEpochDay(18460),
                     64822000,
                     64822123,
                     64822123,