diff --git a/src/main/java/com/gxwebsoft/common/system/entity/TenantPackage.java b/src/main/java/com/gxwebsoft/common/system/entity/TenantPackage.java index 3aa1f5c..25d5e36 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/TenantPackage.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/TenantPackage.java @@ -1,6 +1,7 @@ package com.gxwebsoft.common.system.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -66,8 +67,10 @@ public class TenantPackage implements Serializable { private Integer sortNumber; @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; } diff --git a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java index ddff4af..028624a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java @@ -36,11 +36,11 @@ public class TenantSubscription implements Serializable { private Integer version; @Schema(description = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @Schema(description = "到期时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; @Schema(description = "是否试用期") @@ -62,11 +62,11 @@ public class TenantSubscription implements Serializable { private Integer status; @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - @Schema(description = "修改时间1") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; // 关联查询字段 diff --git a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscriptionOrder.java b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscriptionOrder.java index f92f56e..37dcd25 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscriptionOrder.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscriptionOrder.java @@ -1,6 +1,7 @@ package com.gxwebsoft.common.system.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -54,9 +55,11 @@ public class TenantSubscriptionOrder implements Serializable { private BigDecimal actualPrice; @Schema(description = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; @Schema(description = "是否试用 0否 1是") @@ -78,6 +81,7 @@ public class TenantSubscriptionOrder implements Serializable { private String paymentId; @Schema(description = "支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date paymentTime; @Schema(description = "订单状态 0待支付 1已支付 2已激活 3已取消 4已退款") @@ -90,8 +94,10 @@ public class TenantSubscriptionOrder implements Serializable { private Integer userId; @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; }