From 8837ca248ca273fb5703de02c6842b73e1d230f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 18:26:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 5753b57..ebcd2d1 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
@@ -37,5 +37,7 @@
@ApiModelProperty(value = "优惠券id")
private Integer couponId;
@ApiModelProperty(value = " 是否删除0否1是 前端忽略")
- private Integer delFlag;
+ private Boolean delFlag;
+ @ApiModelProperty(value = " 是否删除0否1是 前端忽略")
+ private Long id;
}
--
Gitblit v1.7.1