diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java index 8b6a914..57a675e 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java @@ -64,12 +64,16 @@ public class EtCoupon extends BaseEntity /** 描述 */ @Excel(name = "描述") - private String desc; + private String descr; /** 零售价 */ @Excel(name = "零售价") private BigDecimal retailPrice; + /** 原价 */ + @Excel(name = "原价") + private String originalPrice; + /** 有效期值 */ @Excel(name = "有效期值") private Integer validityValue; diff --git a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml index 0e975b7..2e04001 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml @@ -16,13 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + - select coupon_id, name, type, discount_percent, area_id, discount_amount, create_time, validity_value, validity_unit, status, limit_num, `desc`, retail_price, is_hot from et_coupon + select coupon_id, name, type, discount_percent, area_id, discount_amount, create_time, validity_value, validity_unit, status, limit_num, `descr`, retail_price, original_price, is_hot from et_coupon