From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SalesDetailVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SalesDetailVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SalesDetailVO.java
index 99674b7..4c416e8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SalesDetailVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SalesDetailVO.java
@@ -11,8 +11,8 @@
public class SalesDetailVO {
// 基础信息
private Long id; // 主键ID[8]
- private String huiMinName; // 惠民卡名称
- private Integer huiMinType; // 惠民卡类型（1:年度卡,2:年内卡）
+ private String huiMinName; // 玩湃惠民卡名称
+ private Integer huiMinType; // 玩湃惠民卡类型（1:年度卡,2:年内卡）
private BigDecimal salesMoney; // 售卖金额（精确计算）
// 关联信息
@@ -29,7 +29,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date paymentTime; // 购买时间[1,8](@ref)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime; // 有效期
// 使用信息
--
Gitblit v1.7.1