From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 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..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
@@ -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 Long memberCouponId;
+
+    @TableField("sure_num")
+    private Integer sureNum;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1