From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/Ad.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Ad.java b/server/services/src/main/java/com/doumee/dao/business/model/Ad.java
index 11f5b9f..aa7d2d7 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Ad.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Ad.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;
@@ -26,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -70,8 +71,14 @@
@ExcelColumn(name="鍐呭")
private String content;
- @ApiModelProperty(value = "鍒楄〃鍥�")
+ @ApiModelProperty(value = "鍒楄〃鍥� ")
@ExcelColumn(name="鍒楄〃鍥�")
private String imgurl;
+
+ @ApiModelProperty(value = "鍒楄〃鍥� ")
+ @ExcelColumn(name="鍒楄〃鍥�")
+ @TableField(exist = false)
+ private String imgfullurl;
+
}
--
Gitblit v1.9.3