From 7c220e1e14cb099ac6b7f08b911b037b79cf9da8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 22 八月 2024 17:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
index 2a10521..5753b57 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -11,7 +11,9 @@
@ApiModel("管理后台 优惠券兑换记录列表返回VO")
public class ExchangeRecordVO {
@ApiModelProperty(value = "获得时间")
- private String createTime;
+ private String createTime1;
+ @ApiModelProperty(value = "获得时间 前端忽略")
+ private LocalDateTime createTime;
@ApiModelProperty(value = "获得用户")
private String phone;
@ApiModelProperty(value = "优惠金额")
@@ -26,8 +28,14 @@
private LocalDateTime endTime;
@ApiModelProperty(value = "关联订单")
private String orderId;
+ @ApiModelProperty(value = "封面图")
+ private String coverPicture;
+ @ApiModelProperty(value = "详情图")
+ private String detailsPicture;
@ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买")
private Integer waysToObtain;
- @ApiModelProperty(value = " 是否删除0否1是")
+ @ApiModelProperty(value = "优惠券id")
+ private Integer couponId;
+ @ApiModelProperty(value = " 是否删除0否1是 前端忽略")
private Integer delFlag;
}
--
Gitblit v1.7.1