cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改children的返回值来消除前端element组件的警告

Browse Source
This commit is contained in:
hupeng
2020-07-09 18:52:49 +08:00
parent e49f5eac96
commit 65d3b6583e
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
View File

@ -8,6 +8,7 @@
*/ */
package co.yixiang.modules.system.service.dto; package co.yixiang.modules.system.service.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -33,6 +34,7 @@ public class DeptDto implements Serializable {
/** 状态 */ /** 状态 */
private Boolean enabled; private Boolean enabled;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<DeptDto> children; private List<DeptDto> children;
/** 创建日期 */ /** 创建日期 */

5
yshop-mall/src/main/java/co/yixiang/modules/category/service/dto/YxStoreCategoryDto.java
View File

@ -36,11 +36,6 @@ public class YxStoreCategoryDto implements Serializable {
/** 是否推荐 */ /** 是否推荐 */
private Integer isShow; private Integer isShow;
/** 添加时间 */
private Integer addTime;
/** 删除状态 */
private Integer isDel;
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<YxStoreCategoryDto> children; private List<YxStoreCategoryDto> children;

2
yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java
View File

@ -91,8 +91,6 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpl<StoreCategoryMap
map.put("排序", yxStoreCategory.getSort()); map.put("排序", yxStoreCategory.getSort());
map.put("图标", yxStoreCategory.getPic()); map.put("图标", yxStoreCategory.getPic());
map.put("是否推荐", yxStoreCategory.getIsShow()); map.put("是否推荐", yxStoreCategory.getIsShow());
map.put("添加时间", yxStoreCategory.getAddTime());
map.put("删除状态", yxStoreCategory.getIsDel());
list.add(map); list.add(map);
} }
FileUtil.downloadExcel(list, response); FileUtil.downloadExcel(list, response);