From 3dddd301e97c263dda6326c89fa11176d5960b04 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 12:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 d3a6225..e0f3777 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
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id")
- private String id;
+ private Long id;
/**
* 删除标记
*/
@@ -64,10 +64,15 @@
@TableField("coupon_name")
private String couponName;
/**
- * 发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义
+ * 发送类型1.手动领取2.指定发放,3.抽奖领取
*/
@TableField("send_type")
private Integer sendType;
+ /**
+ * 发送对象2.全部用户3.会员用户4非会员用户5自定义
+ */
+ @TableField("send_target")
+ private Integer sendTarget;
/**
* 发送时间类型1立即2定时
*/
@@ -137,6 +142,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