From 7ea47db47d3e039e25531cd511d8d7b1342ccfc0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 23 十月 2024 20:04:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/query/ExchangeRecordGoodsQuery.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/query/ExchangeRecordGoodsQuery.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/query/ExchangeRecordGoodsQuery.java
index 573f3a5..894791d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/query/ExchangeRecordGoodsQuery.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/query/ExchangeRecordGoodsQuery.java
@@ -8,10 +8,10 @@
@Data
@ApiModel("管理后台 优惠券兑换记录")
public class ExchangeRecordGoodsQuery extends BasePage {
- @ApiModelProperty(value = "用户名称")
- private String name;
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
@ApiModelProperty(value = "状态1未使用 2已使用 3已过期 4已取消")
- private Integer state;
+ private Integer status;
@ApiModelProperty(value = "优惠券id",required = true)
private Integer couponId;
}
--
Gitblit v1.7.1