From bfd4f08b4304cac2822db86de3712e1c6b37f6ab Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 04 三月 2025 09:07:50 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 893616e..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 = "缂栬緫浜�")
@@ -118,8 +118,8 @@
@ApiModelProperty(value = "閿�閲忔瘡澶╅檺棰�", example = "1")
private Integer saleDayLimit;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1浣滃簾 2杩囨湡鎴栫敤瀹�", example = "1")
- @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝ｅ父锛�1=浣滃簾锛�2=杩囨湡鎴栫敤瀹�")
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1浣滃簾 2寰呮敮浠�", example = "1")
+ @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝ｅ父;1=浣滃簾;2=寰呮敮浠�")
private Integer status;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)")
@@ -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