From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 17 十月 2024 09:39:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 5 ++++- 1 files changed, 4 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..b4c806e 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,8 @@ @ApiModelProperty(value = "优惠券id") private Integer couponId; @ApiModelProperty(value = " 是否删除0否1是 前端忽略") - private Integer delFlag; + private Boolean delFlag; + @ApiModelProperty(value = " 是否删除0否1是 前端忽略") + private Long id; + private Long appUserId; } -- Gitblit v1.7.1