From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 18:25:00 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
index 91e765e..ac0e439 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
@@ -27,14 +27,14 @@
     private String id;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     @ApiModelProperty(value = "鍒涘缓浜�")
     private String creator;
 
     @ApiModelProperty(value = "缂栬緫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date editDate;
 
     @ApiModelProperty(value = "缂栬緫浜�")
@@ -146,6 +146,14 @@
     @TableField(exist = false)
     private Integer useTimes;
 
+    @ApiModelProperty(value = "浣跨敤鏃堕暱")
+    @TableField(exist = false)
+    private Integer useTime;
+
+    @ApiModelProperty(value = "鍓╀綑鏃堕暱",hidden = true)
+    @TableField(exist = false)
+    private Integer surplusTime;
+
     @ApiModelProperty(value = "楠戣璁板綍")
     @TableField(exist = false)
     private List<DiscountLog> discountLogList;

--
Gitblit v1.9.3