From 508f3e225df87e0da974424981e7782fc5ce875c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:21:39 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSaleGoods.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSaleGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSaleGoods.java
index f390a45..7e2ad6e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSaleGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSaleGoods.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -40,10 +41,12 @@
     private String goodsNum;
 
     @ApiModelProperty(value = "商品名称")
+    @Excel(name = "进货商品", width = 15)
     @TableField("goodsName")
     private String goodsName;
 
     @ApiModelProperty(value = "商品成本价")
+    @Excel(name = "商品进价", width = 15,isStatistics = true)
     @TableField("goodsCostPrice")
     private BigDecimal goodsCostPrice;
 
@@ -52,22 +55,22 @@
     private BigDecimal goodsSalePrice;
 
     @ApiModelProperty(value = "商品数量")
+    @Excel(name = "进货数量", width = 15)
     @TableField("goodsCount")
     private Integer goodsCount;
 
     @ApiModelProperty(value = "售卖价格")
-    @TableField("salePrice")
-    private BigDecimal salePrice;
+    @TableField("thisSalePrice")
+    private BigDecimal thisSalePrice;
 
     @ApiModelProperty(value = "商品图")
     @TableField("goodsPicture")
     private String goodsPicture;
 
-    @ApiModelProperty(value = "菜品类型")
-    @TableField("typeName")
-    private String typeName;
     @ApiModelProperty(value = "类型id")
     @TableField("typeId")
     private Long typeId;
-
+    @ApiModelProperty(value = "商品id")
+    @TableField("goodsId")
+    private Long goodsId;
 }

--
Gitblit v1.7.1