From 6cc3ee53a1088abf6a8083c9e72ca9647bb6428f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 六月 2025 16:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Information.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Information.java b/server/src/main/java/com/doumee/dao/business/model/Information.java
index 113c39d..eb4a68b 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Information.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Information.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -58,11 +56,11 @@
@ApiModelProperty(value = "鎻忚堪")
@ExcelColumn(name="鎻忚堪")
- private String describe;
+ private String detail;
@ApiModelProperty(value = "鍐呭")
@ExcelColumn(name="鍐呭")
- private String contnet;
+ private String content;
@ApiModelProperty(value = "灏侀潰鍥剧墖鍦板潃")
@ExcelColumn(name="灏侀潰鍥剧墖鍦板潃")
@@ -70,13 +68,17 @@
@ApiModelProperty(value = "鍙戝竷鏃堕棿")
@ExcelColumn(name="鍙戝竷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
+ @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
+ private Integer status;
+
@ApiModelProperty(value = "灏侀潰鍥剧墖鍦板潃")
@TableField(exist = false)
private String fullImgurl;
--
Gitblit v1.9.3