From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/News.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/News.java b/server/service/src/main/java/com/doumee/dao/business/model/News.java
index 0d61f8d..0d633f5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/News.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/News.java
@@ -11,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 璧勮鍜屽畾鍒舵湇鍔′俊鎭〃
@@ -70,6 +71,9 @@
@ApiModelProperty(value = "璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼", example = "1")
@ExcelColumn(name="璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼")
private Integer linkType;
+ @ApiModelProperty(value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", example = "1")
+ @ExcelColumn(name="闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛")
+ private Integer fileType;
@ApiModelProperty(value = "鐘舵�� 0灞曠ず 1涓嶅睍绀�", example = "1")
@ExcelColumn(name="鐘舵�� 0灞曠ず 1涓嶅睍绀�")
@@ -102,6 +106,9 @@
@ExcelColumn(name="鏈�杩戝彂甯冧汉")
@TableField(exist = false)
private String publishUserName;
+ @ApiModelProperty(value = "闄勪欢闆嗗悎")
+ @TableField(exist = false)
+ private List<Multifile> fileList;
@ApiModelProperty(value = "绱犳潗绫诲瀷 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟", example = "1")
@ExcelColumn(name="绱犳潗绫诲瀷 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟")
--
Gitblit v1.9.3