From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 06e167a..3084569 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>
@@ -101,7 +101,7 @@
* 使用时间
*/
@TableField("use_time")
- private String useTime;
+ private Date useTime;
/**
* 商品类型1周期2服务3体验
@@ -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 Long memberCouponId;
+
+ @TableField("sure_num")
+ private Integer sureNum;
+
@Override
protected Serializable pkVal() {
return this.consumerGoodsId;
--
Gitblit v1.7.1