From 3b21b61d28097c72811ce5a0a6a72b7722c68b1d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 二月 2025 11:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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..f81fa77 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
@@ -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