From 9c4b38c6382b2a33d1716c962553ece34e4913f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 10:03:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java
index d6fcd90..bfc5838 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java
@@ -15,11 +15,12 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private String id;
@ApiModelProperty(value = "优惠券名称")
@TableField("name")
private String name;
private Integer type;
+ private Integer couponId;
@ApiModelProperty(value = "优惠方式（1=满减，2=抵扣）")
@TableField("preferential_mode")
private Integer preferentialMode;
@@ -42,4 +43,7 @@
@TableField("start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private LocalDateTime startTime;
+ @ApiModelProperty(value = "最高优惠金额")
+ @TableField("maximum_discount_amount")
+ private BigDecimal maximumDiscountAmount;
}
--
Gitblit v1.7.1