From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
index 7acbc2e..cfebaed 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
@@ -84,13 +84,13 @@
/**
* 折扣金额
*/
- @TableField("dicount_money")
- private BigDecimal dicountMoney;
+ @TableField("discount_money")
+ private BigDecimal discountMoney;
/**
* 折扣百分比
*/
- @TableField("discout_percent")
- private BigDecimal discoutPercent;
+ @TableField("discount_percent")
+ private BigDecimal discountPercent;
/**
* 使用范围1.全场2.指定商品
*/
@@ -132,6 +132,8 @@
@TableField("deadline_time")
private Date deadlineTime;
+ @TableField("rel_goods_ids")
+ private String relGoodsIds;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1