ソースを参照

fix[litemall-db]: 订单的ship_end_time设置LocalDateTime。

Junling Bu 7 年 前
コミット
8887d68de3

+ 1 - 1
litemall-db/mybatis-generator/generatorConfig.xml

@@ -118,7 +118,7 @@
             <columnOverride javaType="java.time.LocalDateTime" column="add_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="add_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="pay_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="pay_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="ship_start_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="confirm_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="end_time"/>
             <columnOverride javaType="java.time.LocalDateTime" column="end_time"/>
         </table>
         </table>

+ 3 - 3
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
      * @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
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      */
      */
-    public Date getShipEndTime() {
+    public LocalDateTime getShipEndTime() {
         return shipEndTime;
         return shipEndTime;
     }
     }
 
 
@@ -697,7 +697,7 @@ public class LitemallOrder {
      *
      *
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      * @mbg.generated Sat Apr 07 10:22:31 CST 2018
      */
      */
-    public void setShipEndTime(Date shipEndTime) {
+    public void setShipEndTime(LocalDateTime shipEndTime) {
         this.shipEndTime = shipEndTime;
         this.shipEndTime = shipEndTime;
     }
     }