Merge branch 'master' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-cmdexectool.git

src/main/resources/templates/env.ftl

@@ -9,4 +9,5 @@
 </#if>
 <#if sparkexecutormemory??>
   spark.executor.memory = "${sparkexecutormemory!}"
-</#if>
+</#if>
\ No newline at end of file
+

src/main/resources/templates/source_hive.ftl

-spark {
-<#if catalogImplementation??>
-  spark.sql.catalogImplementation = "${catalogImplementation!}"
-</#if>
-}
 
 hive {
 <#if pre_sql??>

src/main/resources/templates/source_jdbc.ftl

@@ -38,4 +38,5 @@ jdbc {
 <#if upperBound??>
     jdbc.upperBound = ${upperBound!}
 </#if>
-}
+}
\ No newline at end of file
+

src/main/resources/templates/transform_sql.ftl

@@ -10,4 +10,5 @@ sql {
 	# 表名，可以配置
     table_name = "${table_name!}"
 </#if>
-}
+}
\ No newline at end of file
+