From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtPromotionWishListVO.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtPromotionWishListVO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtPromotionWishListVO.java
index b76eb7c..2e23de9 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtPromotionWishListVO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtPromotionWishListVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.promotion.controller.management.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.ReplyStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +20,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "心愿求购视图对象", description = "心愿求购视图对象")
+@ApiModel(value = "管理后台-心愿求购视图对象", description = "管理后台-心愿求购视图对象")
public class MgtPromotionWishListVO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -46,6 +47,7 @@
private ReplyStatusEnum replyStatus;
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
@ApiModelProperty(value = "会员id")
--
Gitblit v1.7.1