From 8887d68de338f9bac2cd7ca79a22c9dfe112a4d8 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 22 Apr 2018 08:55:41 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-db]:=20=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?ship=5Fend=5Ftime=E8=AE=BE=E7=BD=AELocalDateTime=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-db/mybatis-generator/generatorConfig.xml           | 2 +-
 .../org/linlinjava/litemall/db/domain/LitemallOrder.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/litemall-db/mybatis-generator/generatorConfig.xml b/litemall-db/mybatis-generator/generatorConfig.xml
index a4e1529f..5c552a50 100644
--- a/litemall-db/mybatis-generator/generatorConfig.xml
+++ b/litemall-db/mybatis-generator/generatorConfig.xml
@@ -118,7 +118,7 @@
             <columnOverride javaType="java.time.LocalDateTime" column="add_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="pay_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="ship_start_time"/>
-            <columnOverride javaType="java.time.LocalDateTime" column="shop_end_time"/>
+            <columnOverride javaType="java.time.LocalDateTime" column="ship_end_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="confirm_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="end_time"/>
         </table>
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java
index 9ee208dd..66528551 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java
@@ -183,7 +183,7 @@ public class LitemallOrder {
      *
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      */
-    private Date shipEndTime;
+    private LocalDateTime shipEndTime;
 
     /**
      *
@@ -685,7 +685,7 @@ public class LitemallOrder {
      *
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      */
-    public Date getShipEndTime() {
+    public LocalDateTime getShipEndTime() {
         return shipEndTime;
     }
 
@@ -697,7 +697,7 @@ public class LitemallOrder {
      *
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      */
-    public void setShipEndTime(Date shipEndTime) {
+    public void setShipEndTime(LocalDateTime shipEndTime) {
         this.shipEndTime = shipEndTime;
     }