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/Multifile.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index 3481422..ac4b8ee 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.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.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -62,13 +63,16 @@
@ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鎺ㄥ箍璧勮澶氬浘 1鎺ㄥ箍璧勮瑙嗛 2瀹氬埗鏈嶅姟澶氬浘 3瀹氬埗鏈嶅姟瑙嗛", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0鎺ㄥ箍璧勮澶氬浘 1鎺ㄥ箍璧勮瑙嗛 2瀹氬埗鏈嶅姟澶氬浘 3瀹氬埗鏈嶅姟瑙嗛")
+ @ApiModelProperty(value = "闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛", example = "1")
+ @ExcelColumn(name="闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@ExcelColumn(name="鏂囦欢鍦板潃")
private String fileurl;
+ @ApiModelProperty(value = "鏂囦欢鍦板潃瀹屾暣")
+ @TableField(exist = false)
+ private String fileurlFull;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
--
Gitblit v1.9.3