Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/etl/PersonIncrSync.scala

@@ -109,7 +109,7 @@ case class PersonIncrSync(s: SparkSession,
          |                        FROM ${project}.ads_person_idcard_cloze
          |                        WHERE ds=${personIdDs}
          |                    ) i
-         |             ON a.name=i.name AND a.case_no=i.case_no
+         |             ON a.${dupliCols(0)}=i.name AND a.case_no=i.case_no
          |        ) b
          |WHERE   num = 1
          |AND     CONCAT_WS('',${cols_md5.mkString(",")}) IS NOT NULL