From 4ed08f76b2486320b92934197f7233a3f61375d6 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Thu, 9 May 2024 11:27:41 +0800
Subject: [PATCH] =?UTF-8?q?act=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Ajson=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyl/manager/act/domain/entity/CouponActivity.java  | 10 ++++++----
 .../cyl/manager/act/domain/entity/MemberCoupon.java    |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/CouponActivity.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/CouponActivity.java
index c91822f..d709da3 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/CouponActivity.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/CouponActivity.java
@@ -1,14 +1,14 @@
 package com.cyl.manager.act.domain.entity;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 /**
  * 优惠券活动表对象 act_coupon_activity
  * 
@@ -74,9 +74,11 @@ public class CouponActivity {
     private LocalDateTime endTime;
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/MemberCoupon.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/MemberCoupon.java
index 24b6884..3cdbeda 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/MemberCoupon.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/MemberCoupon.java
@@ -1,14 +1,14 @@
 package com.cyl.manager.act.domain.entity;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 /**
  * 用户领券记录对象 act_member_coupon
  * 
@@ -82,6 +82,7 @@ public class MemberCoupon {
     private LocalDateTime useTime;
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
 }