From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001 From: zhanglin <852614290@qq.com> Date: 星期日, 23 七月 2023 16:04:35 +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 | 10 ++++++++++ 1 files changed, 10 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..6f8e822 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 @@ -123,6 +123,16 @@ */ @TableField("goods_nurses") private String goodsNurses; + /** + * 来源1订单2优惠券3奖品 + */ + @TableField("source_from") + private Integer sourceFrom; + /** + * 用户优惠券id + */ + @TableField("member_coupon_id") + private String memberCouponId; @Override protected Serializable pkVal() { -- Gitblit v1.7.1