From 65d3b6583ecf8c1bd75679105dd51876dca28bbe Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 9 Jul 2020 18:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9children=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC=E6=9D=A5=E6=B6=88=E9=99=A4=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?element=E7=BB=84=E4=BB=B6=E7=9A=84=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/co/yixiang/modules/system/service/dto/DeptDto.java  | 2 ++
 .../modules/category/service/dto/YxStoreCategoryDto.java     | 5 -----
 .../category/service/impl/YxStoreCategoryServiceImpl.java    | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
index 19ccb382..0ec4f4cc 100644
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
@@ -8,6 +8,7 @@
 */
 package co.yixiang.modules.system.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,6 +34,7 @@ public class DeptDto implements Serializable {
     /** 状态 */
     private Boolean enabled;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<DeptDto> children;
 
     /** 创建日期 */
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/category/service/dto/YxStoreCategoryDto.java b/yshop-mall/src/main/java/co/yixiang/modules/category/service/dto/YxStoreCategoryDto.java
index 98292d0a..206d4294 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/category/service/dto/YxStoreCategoryDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/category/service/dto/YxStoreCategoryDto.java
@@ -36,11 +36,6 @@ public class YxStoreCategoryDto implements Serializable {
     /** 是否推荐 */
     private Integer isShow;
 
-    /** 添加时间 */
-    private Integer addTime;
-
-    /** 删除状态 */
-    private Integer isDel;
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<YxStoreCategoryDto> children;
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java
index 549e85f1..e08ddb77 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java
@@ -91,8 +91,6 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl<StoreCategoryMap
             map.put("排序", yxStoreCategory.getSort());
             map.put("图标", yxStoreCategory.getPic());
             map.put("是否推荐", yxStoreCategory.getIsShow());
-            map.put("添加时间", yxStoreCategory.getAddTime());
-            map.put("删除状态", yxStoreCategory.getIsDel());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);