From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/OrderGoods.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/OrderGoods.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/OrderGoods.java
index 2b1c95c..2f031c2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/OrderGoods.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/OrderGoods.java
@@ -1,15 +1,15 @@
package com.ruoyi.order.domain.pojo.order;
-import java.math.BigDecimal;
-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.math.BigDecimal;
/**
* <p>
@@ -62,6 +62,9 @@
*/
@TableField("goods_price")
private BigDecimal goodsPrice;
+
+ @TableField("goods_deposit")
+ private BigDecimal goodsDeposit;
/**
* 商品总价
*/
@@ -88,6 +91,20 @@
@TableField("goods_type")
private Integer goodsType;
+ @TableField("goods_name")
+ private String goodsName;
+
+ @TableField("goods_tag")
+ private String goodsTag;
+
+ @TableField("goods_introduction")
+ private String goodsIntroduction;
+
+ @TableField("goods_picture")
+ private String goodsPicture;
+
+
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1