From 8a6e29b72b66c16da7998d14fa1f8705985787a0 Mon Sep 17 00:00:00 2001
From: hupeng <hupeng@hupengdeMacBook-Pro.local>
Date: Fri, 24 Jul 2020 16:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=BF=94=E5=9B=9E=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/wechat/vo/YxArticleQueryVo.java   | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java
index 84aae803..89fd8e82 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java
@@ -1,5 +1,7 @@
 package co.yixiang.modules.wechat.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,9 +24,6 @@ public class YxArticleQueryVo implements Serializable {
     @ApiModelProperty(value = "文章管理ID")
     private Integer id;
 
-    @ApiModelProperty(value = "分类id")
-    private String cid;
-
     @ApiModelProperty(value = "文章标题")
     private String title;
 
@@ -56,25 +55,9 @@ public class YxArticleQueryVo implements Serializable {
     private Boolean status;
 
     @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "是否隐藏")
-    private Boolean hide;
-
-    @ApiModelProperty(value = "管理员id")
-    private Integer adminId;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merId;
-
-    @ApiModelProperty(value = "产品关联id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "是否热门(小程序)")
-    private Integer isHot;
-
-    @ApiModelProperty(value = "是否轮播图(小程序)")
-    private Integer isBanner;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonProperty(value = "addTime")
+    private String createTime;
 
     private String content;