From 0f7e97cd12c2a971d09e3d6ad9d2bad9800f4207 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:20:41 +0800
Subject: [PATCH] 合并代码
---
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