From 23ac3e4f8fb16db0759ba5c91c4d06d622c67009 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 14 七月 2025 14:49:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/model/excel/FeedExportExcel.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/linghu/model/excel/FeedExportExcel.java b/src/main/java/com/linghu/model/excel/FeedExportExcel.java
index 44d510c..ca89812 100644
--- a/src/main/java/com/linghu/model/excel/FeedExportExcel.java
+++ b/src/main/java/com/linghu/model/excel/FeedExportExcel.java
@@ -1,39 +1,47 @@
package com.linghu.model.excel;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class FeedExportExcel {
- @ExcelProperty("平台名称")
+ @ExcelProperty("发布平台")
@ApiModelProperty("平台名称")
private String platform_name;
@ApiModelProperty("平台是否匹配 0-否 1-是")
+ @ExcelIgnore
private Integer platformIs;
@ExcelProperty("标题")
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("标题是否匹配 0-否 1-是")
+ @ExcelIgnore
private Integer titleIs;
@ExcelProperty("发布时间")
@ApiModelProperty("发布时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime create_time;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate create_time;
@ApiModelProperty("发布时间是否匹配 0-否 1-是")
+ @ExcelIgnore
private Integer createIs;
@ExcelProperty("发布网址")
@ApiModelProperty("发布网址")
private String url;
@ApiModelProperty("发布网址是否匹配 0-否 1-是")
+ @ExcelIgnore
private Integer urlIs;
@ExcelProperty("收录情况")
--
Gitblit v1.7.1