From f83037e99a5352da02be428280793fc3203a554b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:27:44 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
index b3bea84..721ae65 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -76,9 +76,7 @@
@ApiModelProperty(value = "状态（1=未使用，2=已使用）")
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "订单id 后台发放的优惠券没有订单id")
- @TableField("orderId")
- private Long orderId;
+
@ApiModelProperty(value = "当前领取优惠卷的json记录")
@TableField("coupon_json")
--
Gitblit v1.7.1