From 050d9d57dd5dfafe63478b3c7b6844b797e30e24 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 16 Sep 2019 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/shop/order/order.html    | 8 ++++----
 .../src/main/java/com/ruoyi/shop/domain/StoreOrder.java   | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/shop/order/order.html b/ruoyi-admin/src/main/resources/templates/shop/order/order.html
index f348e61..3da58a8 100644
--- a/ruoyi-admin/src/main/resources/templates/shop/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/shop/order/order.html
@@ -125,10 +125,10 @@
                 },
                 {
                     field : 'addTime', 
-                    title : '下单时间',
-                    formatter: function (value) {
-                        return $.common.dateFormat('Y-m-d H:i:s',value);
-                    }
+                    title : '下单时间'
+                    // formatter: function (value) {
+                    //     return $.common.dateFormat('Y-m-d H:i:s',value);
+                    // }
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/shop/domain/StoreOrder.java b/ruoyi-system/src/main/java/com/ruoyi/shop/domain/StoreOrder.java
index c33a031..7b36af5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/shop/domain/StoreOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/shop/domain/StoreOrder.java
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -144,7 +145,7 @@ public class StoreOrder extends BaseEntity
 
     /** 下单时间 */
     @Excel(name = "下单时间")
-    private Integer addTime;
+    private Date addTime;
 
     /** 最后新发货时间 */
     @Excel(name = "最后新发货时间")
@@ -542,12 +543,12 @@ public class StoreOrder extends BaseEntity
     {
         return totalAmount;
     }
-    public void setAddTime(Integer addTime) 
+    public void setAddTime(Date addTime)
     {
         this.addTime = addTime;
     }
 
-    public Integer getAddTime() 
+    public Date getAddTime()
     {
         return addTime;
     }