From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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..dbf46d2 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,15 @@
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 8,width = 16,dateFormat = "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 = "缂栬緫浜�")
@@ -55,7 +56,7 @@
private String name;
@ApiModelProperty(value = "绫诲瀷 0鏈熼檺鍗� 1娆″崱", example = "1")
- @ExcelColumn(name="濂楅绫诲瀷",index = 1,valueMapping = "0=鏈熼檺鍗★紱1=娆″崱锛�",width = 10)
+ @ExcelColumn(name="濂楅绫诲瀷",index = 1,valueMapping = "0=鏈熼檺鍗�;1=娆″崱;",width = 10)
private Integer type;
@ApiModelProperty(value = "姣忔棩楠戣闄愬埗绫诲瀷 0涓嶉檺鍒� 1闄愬埗", example = "1")
@@ -118,8 +119,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 +147,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;
@@ -154,4 +163,14 @@
@ApiModelProperty(value = "鎿嶄綔璁板綍")
@TableField(exist = false)
private List<DiscountLog> optLogList;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startCreateDate;
+
+ @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endCreateDate;
}
--
Gitblit v1.9.3