Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_check_info.scala

@@ -27,7 +27,7 @@ case class company_check_info() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     s"""
-       |日期：${new_map("check_date")}\n
+       |日期：${new_map("check_date")}
        |结果：${new_map("check_result")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_announcement_list.scala

@@ -28,9 +28,9 @@ case class company_court_announcement_list() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     s"""
-       |案号:${new_map("case_no")}万元\n
-       |上诉人：${new_map("plaintiff")}\n
-       |被上诉人：${new_map("litigant")}\n
+       |案号:${new_map("case_no")}万元
+       |上诉人：${new_map("plaintiff")}
+       |被上诉人：${new_map("litigant")}
        |刊登日期：${new_map("publish_date")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_open_announcement_list.scala

@@ -29,8 +29,8 @@ case class company_court_open_announcement_list() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |开庭时间：${new_map("start_date")}\n
-       |案号：${new_map("case_no")}\n
+       |开庭时间：${new_map("start_date")}
+       |案号：${new_map("case_no")}
        |案由：${new_map("case_reason")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_register_list.scala

@@ -29,8 +29,8 @@ case class company_court_register_list() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |立案日期：${new_map("filing_date")}\n
-       |上诉人：${new_map("plaintiff")}\n
+       |立案日期：${new_map("filing_date")}
+       |上诉人：${new_map("plaintiff")}
        |被上诉人：${new_map("defendant")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_double_random_check_info.scala

@@ -26,9 +26,9 @@ case class company_double_random_check_info() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     s"""
-       |任务编号：${new_map("check_task_num")}\n
-       |任务名称：${new_map("check_task_name")}\n
-       |抽查机关：${new_map("check_department")}\n
+       |任务编号：${new_map("check_task_num")}
+       |任务名称：${new_map("check_task_name")}
+       |抽查机关：${new_map("check_department")}
        |完成日期：${new_map("check_date")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_judicial_sale_combine_list.scala

@@ -28,8 +28,8 @@ case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |标题：${new_map("title")}\n
-       |起拍价：${new_map("initial_price")}\n
+       |标题：${new_map("title")}
+       |起拍价：${new_map("initial_price")}
        |拍卖时间：${new_map("start_time")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license.scala

@@ -27,10 +27,10 @@ case class company_license() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |许可证编号：${new_map("license_number")}\n
-       |有效期自：${new_map("start_date")}\n
-       |有效期至：${new_map("end_date")}\n
-       |许可机关：${new_map("department")}\n
+       |许可证编号：${new_map("license_number")}
+       |有效期自：${new_map("start_date")}
+       |有效期至：${new_map("end_date")}
+       |许可机关：${new_map("department")}
        |许可内容：${new_map("scope")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_creditchina.scala

@@ -28,10 +28,10 @@ case class company_license_creditchina() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |许可证编号：${new_map("licence_number")}\n
-       |有效期自：${new_map("decision_date")}\n
-       |有效期至：${new_map("end_date")}\n
-       |许可机关：${new_map("department")}\n
+       |许可证编号：${new_map("licence_number")}
+       |有效期自：${new_map("decision_date")}
+       |有效期至：${new_map("end_date")}
+       |许可机关：${new_map("department")}
        |许可内容：${new_map("resume")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_entpub.scala

@@ -27,10 +27,10 @@ case class company_license_entpub() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |许可证编号：${new_map("license_number")}\n
-       |有效期自：${new_map("start_date")}\n
-       |有效期至：${new_map("end_date")}\n
-       |许可机关：${new_map("department")}\n
+       |许可证编号：${new_map("license_number")}
+       |有效期自：${new_map("start_date")}
+       |有效期至：${new_map("end_date")}
+       |许可机关：${new_map("department")}
        |许可内容：${new_map("scope")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_tax_contravention.scala

@@ -28,7 +28,7 @@ case class company_tax_contravention() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     s"""
-       |案件性质：${new_map("case_type")}\n
+       |案件性质：${new_map("case_type")}
        |发布日期：${new_map("publish_time")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_zxr_final_case.scala

@@ -28,9 +28,9 @@ case class company_zxr_final_case() extends CompanyDynamicHandle {
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
     s"""
-       |案号：${new_map("case_no")}\n
-       |执行法院：${new_map("court_name")}\n
-       |立案日期：${new_map("case_create_time")}\n
+       |案号：${new_map("case_no")}
+       |执行法院：${new_map("court_name")}
+       |立案日期：${new_map("case_create_time")}
        |终本日期：${new_map("case_final_time")}
        |""".stripMargin
   }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/wenshu_detail_combine.scala

@@ -36,9 +36,9 @@ case class wenshu_detail_combine() extends CompanyDynamicHandle {
       }
     }
     s"""
-       |案由：${new_map("case_reason_level3")}\n
-       |案号：${new_map("case_no")}\n
-       |诉讼身份：${t2}\n
+       |案由：${new_map("case_reason_level3")}
+       |案号：${new_map("case_no")}
+       |诉讼身份：${t2}
        |发布日期：${new_map("judge_date")}
        |""".stripMargin
   }