From 248395e467b6d072a6f9a2eba33d7f638142ee73 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期四, 05 七月 2018 01:07:18 +0800
Subject: [PATCH] 商户服务功能测试通过

---
 java110-common/src/main/java/com/java110/common/util/DateUtil.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/java110-common/src/main/java/com/java110/common/util/DateUtil.java b/java110-common/src/main/java/com/java110/common/util/DateUtil.java
index 290b6d4..e872cd8 100644
--- a/java110-common/src/main/java/com/java110/common/util/DateUtil.java
+++ b/java110-common/src/main/java/com/java110/common/util/DateUtil.java
@@ -1,5 +1,6 @@
 package com.java110.common.util;
 
+import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -73,6 +74,19 @@
         return calendar.get(Calendar.MONTH)+1;
     }
 
+    public static Date getLastDate() throws ParseException {
+        return getDateFromString("3000-01-01",DATE_FORMATE_STRING_B);
+    }
+
+    /**
+     * 杞琓imeStamp
+     * @param date
+     * @return
+     */
+    public static Timestamp getTimestamp(Date date){
+        Timestamp timestamp = new Timestamp(date.getTime());
+        return timestamp;
+    }
     /**
      * 鑾峰彇鏈潵鏃堕棿
      * @param second 绉�

--
Gitblit v1.8.0