Merge remote-tracking branch 'origin/v1.8.0_dev' into v1.8.0_dev

xuchao · xuchao · commit 1b0dedb66e33 · 2020-03-26T11:01:36.000+08:00
diff --git a/core/src/main/java/com/dtstack/flink/sql/util/DateUtil.java b/core/src/main/java/com/dtstack/flink/sql/util/DateUtil.java
@@ -33,8 +33,8 @@
 
 
 /**
- *
- * Reason: TODO ADD REASON(可选)
+ * 
+ * 日期工具
  * Date: 2017年03月10日 下午1:16:37
  * Company: www.dtstack.com
  * @author sishu.yss
@@ -805,5 +805,5 @@ public static java.sql.Date getDateFromStr(String dateStr) {
         }
         return new java.sql.Date(stringToDate(dateStr).getTime());
     }
-    
+
 }

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@`
`33`	`33`
`34`	`34`
`35`	`35`	`/**`
`36`		`- *`
`37`		`- * Reason: TODO ADD REASON(可选)`
	`36`	`+ *`
	`37`	`+ * 日期工具`
`38`	`38`	`* Date: 2017年03月10日下午1:16:37`
`39`	`39`	`* Company: www.dtstack.com`
`40`	`40`	`* @author sishu.yss`
`@@ -805,5 +805,5 @@ public static java.sql.Date getDateFromStr(String dateStr) {`
`805`	`805`	`}`
`806`	`806`	`return new java.sql.Date(stringToDate(dateStr).getTime());`
`807`	`807`	`}`
`808`		`-`
	`808`	`+`
`809`	`809`	`}`