From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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/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