Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncrForCidsUtils.scala

@@ -188,7 +188,7 @@ case class CompanyIncrForCidsUtils(s: SparkSession,
          |INSERT OVERWRITE TABLE  $inc_ads_company_tb PARTITION(ds='$lastDsIncOds')
          |SELECT  ${subRes.mkString(",")}
          |FROM    (
-         |            SELECT  $split_cols,${sublistTableFieldName.mkString(",")}
+         |            SELECT  $split_cols,${columns.mkString(",")}
          |                    ,ROW_NUMBER() OVER (PARTITION BY id ORDER BY update_time DESC ) num
          |                    ,md5(cleanup(CONCAT_WS('',${cols_md5.mkString(",")}))) AS rowkey
          |            FROM    ${inc_ods_company_tb}