From 05bc0e7b6898dc56f45d2ac51d770883c68dadb1 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 21 二月 2025 09:00:06 +0800 Subject: [PATCH] jtt808初始化 --- server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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 d9538d0..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 @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 鐢ㄦ埛楠戣濂楅鍗″叧鑱旇〃 @@ -117,8 +118,8 @@ @ApiModelProperty(value = "閿�閲忔瘡澶╅檺棰�", example = "1") private Integer saleDayLimit; - @ApiModelProperty(value = "鐘舵�� 0姝e父 1浣滃簾 2杩囨湡鎴栫敤瀹� ", example = "1") - @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝e父锛�1=浣滃簾锛�2=杩囨湡鎴栫敤瀹�") + @ApiModelProperty(value = "鐘舵�� 0姝e父 1浣滃簾 2寰呮敮浠�", example = "1") + @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝e父;1=浣滃簾;2=寰呮敮浠�") private Integer status; @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)") @@ -144,4 +145,21 @@ @ExcelColumn(name="浣跨敤娆℃暟",index = 4,width = 20) @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; + + + @ApiModelProperty(value = "鎿嶄綔璁板綍") + @TableField(exist = false) + private List<DiscountLog> optLogList; } -- Gitblit v1.9.3