From 330f39a4e5ac926d6a61dab239bff903dda91fb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Multifile.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/src/main/java/com/doumee/dao/business/model/Multifile.java
index a42383f..5408a5c 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/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.ExcelExportColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -62,8 +63,10 @@
@ExcelExportColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1瀹夊叏椋庨櫓涓婃姤 2瀹夊叏椋庨櫓澶勭悊 3瀹夊叏椋庨櫓鍒嗛厤鐗╀笟涓荤 4瀹夊叏椋庨櫓鍒嗛厤澶勭悊浜� 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊", example = "1")
- @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1瀹夊叏椋庨櫓涓婃姤 2瀹夊叏椋庨櫓澶勭悊 3瀹夊叏椋庨櫓鍒嗛厤鐗╀笟涓荤 4瀹夊叏椋庨櫓鍒嗛厤澶勭悊浜� 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊")
+// @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖", example = "1")
+// @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦", example = "1")
+ @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@@ -78,4 +81,14 @@
@ExcelExportColumn(name="浼佷笟缂栫爜(鍏宠仈company琛級")
private Integer companyId;
+ @ApiModelProperty(value = "鏂囦欢鍦板潃")
+ @TableField(exist = false)
+ private String fileurlFull;
+
+
+ @ApiModelProperty(value = "鍐呯綉鏂囦欢鍦板潃")
+ @TableField(exist = false)
+ private String localFileurlFull;
+
+
}
--
Gitblit v1.9.3