From c3363d35b8dd42a862681d505360cd2c72d070a1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 10 八月 2024 18:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 43c0f6d..b0cf1c1 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 = "优惠金额")
@@ -28,9 +30,8 @@
private String orderId;
@ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买")
private Integer waysToObtain;
- @ApiModelProperty(value = " 是否删除0否1是")
+ @ApiModelProperty(value = "优惠券id")
+ private Integer couponId;
+ @ApiModelProperty(value = " 是否删除0否1是 前端忽略")
private Integer delFlag;
- @ApiModelProperty(value = "三方支付流水号 前端忽略")
- private String serialNumber;
-
}
--
Gitblit v1.7.1