From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index a66a19d..b2f5efa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鍒嗙被淇℃伅琛�
@@ -66,12 +68,17 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷")
- @ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
+ @ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
+ @ApiModelProperty(value = "瀛愰泦鍒嗙被")
+ @TableField(exist = false)
+ private List<Category> childCategoryList;
+
+
}
--
Gitblit v1.9.3