From 3a86c9c6879971051ab1e01a5b9b88eed27e55db Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 17:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
index 796436c..ad8e9b2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
/**
* 鍋滆溅搴撲俊鎭〃
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鍋滆溅搴撲俊鎭〃")
@@ -53,11 +54,11 @@
@ApiModelProperty(value = "棰樼洰")
@ExcelColumn(name="棰樼洰")
- private String title;
+ private String name;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -99,4 +100,8 @@
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+ @ApiModelProperty(value = "鎵�灞炲仠杞﹀簱", example = "1")
+ @TableField(exist = false)
+ private String parentName;
+
}
--
Gitblit v1.9.3