From 9a0e2661c69fea29a0a53ecdf9e11333da9b9615 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 07 七月 2025 15:27:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Carousel.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Carousel.java b/server/src/main/java/com/doumee/dao/business/model/Carousel.java
index 11ec518..45cd9c1 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Carousel.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Carousel.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,7 +56,7 @@
@ApiModelProperty(value = "鎻忚堪")
@ExcelColumn(name="鎻忚堪")
- private String describe;
+ private String detail;
@ApiModelProperty(value = "鍥剧墖鍦板潃")
@ExcelColumn(name="鍥剧墖鍦板潃")
@@ -72,13 +70,13 @@
@ExcelColumn(name="绫诲瀷锛�0=棣栭〉杞挱锛�")
private Integer type;
- @ApiModelProperty(value = "璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�2=瀵屾枃鏈紱3=鍐呴儴鍦板潃", example = "1")
- @ExcelColumn(name="璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�2=瀵屾枃鏈紱3=鍐呴儴鍦板潃")
+ @ApiModelProperty(value = "璺宠浆绫诲瀷锛�0=澶栭摼锛�1=瀵屾枃鏈紱", example = "1")
+ @ExcelColumn(name="璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�")
private Integer jumpType;
@ApiModelProperty(value = "璺宠浆鍦板潃")
@ExcelColumn(name="璺宠浆鍦板潃")
- private String contnet;
+ private String content;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
--
Gitblit v1.9.3