Merge remote-tracking branch 'origin/master'

jobs/task-step02.yaml

@@ -62,13 +62,13 @@ job:
           - _nodeId: 700003375026
             project: winhc_eci_dev
             tableName: company_land_announcement
-            dupliCols: new_cid,source,e_number,application_name
+            dupliCols: new_cid,source_url,e_number,project_name
             flag: cid
           - _nodeId: 700003380225
             project: winhc_eci_dev
             tableName: company_land_announcement
             cidField: new_cid
-            dupliCols: new_cid,source,e_number,application_name
+            dupliCols: new_cid,source_url,e_number,project_name
       #------>
       #------<地块公示:Spark
       - taskName: company_land_publicity
@@ -126,7 +126,7 @@ job:
             DIM_TABLE: company_land_mortgage
             DIM_COLUMS: type,id,land_mark,land_num,land_aministrative_area,land_loc,land_area,other_item_num,use_right_num,mortgagor,mortgagee,nature,use_for,use_type,area,evaluate_amount,mortgage_amount,source_url,start_date,end_date,create_time,update_time,deleted
             DUPLI_COLS: new_cid,type,source_url,land_mark,land_num
-            MD5_COLS: type,source_url,land_mark,land_num
+            MD5_COLS: type,land_num,land_mark,source_url
           - _nodeId: 700003422526
             PROJECT: winhc_eci_dev
             DIM_TABLE: company_land_mortgage
@@ -145,8 +145,8 @@ job:
             PROJECT: winhc_eci_dev
             DIM_TABLE: company_land_transfer
             DIM_COLUMS: type,id,mark,num,location,aministrative_area,user_pre,user_now,area,use_for,use_type,years_of_use,situation,level,merchandise_type,merchandise_price,merchandise_time,url,create_time,update_time,deleted
-            DUPLI_COLS: new_cid,type,url,num,mark,location
-            MD5_COLS: type,url,num,mark,location
+            DUPLI_COLS: new_cid,type,num,location,url
+            MD5_COLS: type,num,location,url
             DS: 20200717
           - _nodeId: 700003421692
             PROJECT: winhc_eci_dev