From f29c8786807015d78b9be8a33397f69478d92a76 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 12 七月 2025 16:52:27 +0800
Subject: [PATCH] 1.设备优化 2.配煤计算器

---
 main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
index 7f5d55c..6012216 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.MyBaseEntity;
 import lombok.Data;
 
@@ -31,6 +32,7 @@
      * 閿�鍞棩鏈�
      */
     @TableField(value = "sale_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate saleDate;
     /**
      * 瀹㈡埛id
@@ -46,12 +48,7 @@
      * 鐓ょid
      */
     @TableField(value = "coal_id")
-    private String coalId;
-    /**
-     * 鐓ょ
-     */
-    @TableField(value = "coal")
-    private String coal;
+    private Long coalId;
     /**
      * 鍗曚环锛堝惈绋庯級
      */
@@ -61,7 +58,7 @@
      * 搴撳瓨鏁伴噺
      */
     @TableField(value = "inventory_quantity")
-    private Long inventoryQuantity;
+    private BigDecimal inventoryQuantity;
     /**
      * 鍗曚綅
      */
@@ -103,6 +100,11 @@
     @TableField(value = "net_profit")
     private BigDecimal netProfit;
     /**
+     * 杩愯垂
+     */
+    @TableField(value = "freight")
+    private BigDecimal freight;
+    /**
      * 鐧昏浜篿d
      */
     @TableField(value = "registrant_id")
@@ -116,5 +118,6 @@
      * 鐧昏鏃ユ湡
      */
     @TableField(value = "registration_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate registrationDate;
 }
\ No newline at end of file

--
Gitblit v1.9.3