From 197431f6ce578d87a0156d2b8b13f1d327ba5e1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 14:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java
index 6f958ae..9fab2af 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java
@@ -17,7 +17,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class PointMerchandiseIncomeVo {
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
private BigDecimal cash;
}
--
Gitblit v1.7.1