From 9b7d12d6dbfd627e983d3b643b0a8bc7b528d8c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:48:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
index 12d5793..a9096e4 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
@@ -69,6 +69,7 @@
* 领取时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
/**
* 现金支付方式(1=微信2支付宝)
--
Gitblit v1.7.1