Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamic.scala

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamicHandle.scala

@@ -27,7 +27,7 @@ trait CompanyDynamicHandle {
     , "" -> "" //对外投资
     , "" -> "eci_administrativepenalty" //行政处罚
     , "" -> "eci_chattel" //动产抵押
-    , "" -> "env_punishment" //环保处罚
+    , "company_env_punishment" -> "env_punishment" //环保处罚
     , "" -> "judicial_assistance" //股权冻结
     , "" -> "publish_notice" //公示催告
     , "" -> "serious_violation" //严重违法
@@ -60,7 +60,7 @@ trait CompanyDynamicHandle {
     , "" -> "13" // 招聘信息
     , "" -> "14" // 行政处罚
     , "" -> "15" // 公示催告
-    , "" -> "16" // 环保处罚
+    , "company_env_punishment" -> "16" // 环保处罚
     , "" -> "17" // 股权出质
     , "" -> "18" // 严重违法
     , "" -> "19" // 简易注销

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

@@ -8,7 +8,7 @@ import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
  * @Description TODO
  */
 //环保处罚
-case class company_env_punishment(equCols:Seq[String])extends CompanyDynamicHandle {
+case class company_env_punishment()extends CompanyDynamicHandle {
   /**
    * 信息描述
    *
@@ -16,7 +16,7 @@ case class company_env_punishment(equCols:Seq[String])extends CompanyDynamicHand
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("title")
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("punish_number")
 
   /**
    * 变更内容
@@ -25,7 +25,7 @@ case class company_env_punishment(equCols:Seq[String])extends CompanyDynamicHand
    * @param new_map
    * @return
    */
-  override def get_change_content(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("label")
+  override def get_change_content(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("content")
 
   /**
    * 变更时间