From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +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/Discount.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Discount.java b/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
index 722c77f..45eb9a3 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
@@ -28,7 +28,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -160,7 +160,18 @@
@ApiModelProperty(value = "姣忔棩鍗曚环", example = "1")
private BigDecimal dayPrice;
+ @ApiModelProperty(value = "灏忕▼搴忔煡璇娇鐢�", hidden = true)
+ @TableField(exist = false)
+ private Integer minShow;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String creatorName;
+
+
+ @ApiModelProperty(value = "鏈�鍚庣紪杈戜汉")
+ @TableField(exist = false)
+ private String editorName;
@TableField(exist = false)
@ApiModelProperty(value = "鍥剧墖鍏ㄨ矾寰�", example = "1")
--
Gitblit v1.9.3