From 96c23f980f38cfd00fbb27c62fa6a4902d0ecb93 Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期一, 19 四月 2021 08:06:10 +0800
Subject: [PATCH] add:商家后台代码

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
index 15a7401..f8d11a1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.dtos.shop;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,10 +28,12 @@
     @ApiModelProperty(value = "商品",example = "鞋")
     private String goodsName;
     @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1")
-    private Date status;
+    private Integer status;
     @ApiModelProperty(value = "下单时间-开始",example = "1")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String createAtStart;
     @ApiModelProperty(value = "下单时间-结束",example = "1")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAtEnd;
     @ApiModelProperty(value = "分页-当前页数",example = "1", required = true)
     private Long pageNum;

--
Gitblit v1.7.1