From bfb282648b620bd46ebe23336d626c7b10483826 Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Wed, 5 Jun 2024 21:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E5=91=98=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clerk/module/entity/PlayClerkUserInfoEntity.java | 11 +++++++++++ .../clerk/module/entity/PlayClerkUserReturnVo.java | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java index e131832..f4e463e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java @@ -2,13 +2,16 @@ package com.starry.admin.modules.clerk.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.common.conf.StringTypeHandler; import com.starry.common.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; /** @@ -218,6 +221,14 @@ public class PlayClerkUserInfoEntity extends BaseEntity **/ private String alipayImage; + + /** + * 创建时间 + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime addTime; + /** * 最近一次登录token */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java index 4a1ccd0..57c0461 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java @@ -1,10 +1,13 @@ package com.starry.admin.modules.clerk.module.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -131,6 +134,11 @@ public class PlayClerkUserReturnVo { */ private String address; + /** + * 地址 + */ + private String remark; + /** * 订单列表 */ @@ -152,5 +160,9 @@ public class PlayClerkUserReturnVo { */ private BigDecimal orderTotalAmount; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime addTime; + }