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; }