From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 ec2560f..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
@@ -1,15 +1,15 @@
package com.ruoyi.order.domain.pojo.order;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -109,6 +109,37 @@
@TableField("goods_type")
private Integer goodsType;
+ @TableField("goods_tag")
+ private String goodsTag;
+ /**
+ * 商品名称
+ */
+ @TableField("goods_introduction")
+ private String goodsIntroduction;
+ /**
+ * 商品名称
+ */
+ @TableField("goods_picture")
+ private String goodsPicture;
+ /**
+ * 商品名称
+ */
+ @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() {
return this.consumerGoodsId;
--
Gitblit v1.7.1