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 4baef5db..676a0c34 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 { @Select("SELECT" + + " pro.cover_img as productCover, " + " pro.name as productName, " + " inRecord.id as id," + " inRecord.full_amount as fullAmount," + 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 15c1da29..760a3fb0 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 @@ -12,10 +12,12 @@ public class TbUserCouponVo { private BigDecimal discountAmount; private Integer couponId; private Integer proId; - //优惠券名称 - private String name; // 商品名称 private String productName; + private String productCover; + //优惠券名称 + private String name; + //优惠券类型 1 满减 2 商品券 private Integer type; //数量