From 65948198a6dc5e808440ac6874db6df8aab6d9ab Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 十二月 2024 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java b/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
index 8cbcd7f..3355c0c 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
@@ -52,11 +52,14 @@
@ApiModelProperty(value = "门店id 字段为null表示全部")
@TableField("storeId")
- private Integer storeId;
+ private String storeId;
@ApiModelProperty(value = "有效期截止日期")
@TableField("endTime")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "使用时间")
+ @TableField("useTime")
+ private LocalDateTime useTime;
@ApiModelProperty(value = "优惠条件金额 为0则表示通用券")
@TableField("amountCondition")
--
Gitblit v1.7.1