From 3fd5b6267e4468f179d1f339fee961b89cea7afa Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 23 七月 2023 18:46:58 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
index 166450e..ece300a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
@@ -23,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("t_user_coupon")
+@TableName("t_member_coupon")
public class MemberCoupon extends Model<MemberCoupon> {
private static final long serialVersionUID = 1L;
@@ -45,6 +45,9 @@
*/
@TableField("user_id")
private Long userId;
+
+ @TableField("shop_id")
+ private Long shopId;
/**
* 优惠券类型1.满减2.折扣3.代金4.商品
*/
@@ -134,6 +137,12 @@
@TableField("rel_goods_ids")
private String relGoodsIds;
+ /**
+ * 优惠券来源1平台2商户
+ */
+ @TableField("coupon_from")
+ private Integer couponFrom;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1