From 4982d22e5ac791a8fd34e2d64af69664dfe81b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 6 Nov 2024 10:41:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java | 1 +
 .../src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java
index 7a384e26..4baef5db 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java
@@ -18,6 +18,7 @@ import java.util.List;
 public interface TbActivateInRecordMapper extends BaseMapper<TbActivateInRecord> {
 
     @Select("SELECT" +
+            "            pro.name as productName, " +
             "            inRecord.id as id," +
             "            inRecord.full_amount as fullAmount," +
             "            inRecord.discount_amount as discountAmount," +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java
index 76af2bfb..15c1da29 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java
@@ -14,6 +14,8 @@ public class TbUserCouponVo {
     private Integer proId;
     //优惠券名称
     private String name;
+    // 商品名称
+    private String productName;
     //优惠券类型 1 满减 2 商品券
     private Integer type;
     //数量