From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java
index 56159f0..7ef0330 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java
@@ -108,6 +108,9 @@
*/
@TableField("goods_type")
private Integer goodsType;
+
+ @TableField("goods_tag")
+ private String goodsTag;
/**
* 商品名称
*/
@@ -123,6 +126,19 @@
*/
@TableField("goods_nurses")
private String goodsNurses;
+ /**
+ * 来源1订单2优惠券3奖品
+ */
+ @TableField("source_from")
+ private Integer sourceFrom;
+ /**
+ * 用户优惠券id
+ */
+ @TableField("member_coupon_id")
+ private String memberCouponId;
+
+ @TableField("sure_num")
+ private Integer sureNum;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1