From 4c33acfe648e9b008f91c5e2cf446550e6b0174d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 22 七月 2025 17:35:57 +0800
Subject: [PATCH] 1.正式库导出优化 2.销售导出 3.设备使用状态优化 4.定时任务优化

---
 main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
index 49fa6da..d5fcc4e 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.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;
 
@@ -20,8 +21,6 @@
 @TableName("official_inventory")
 public class OfficialInventory extends MyBaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 涓婚敭ID
      */
@@ -33,15 +32,16 @@
     @TableField(value = "pending_id")
     private Long pendingId;
     /**
-     * 渚涜揣鍟嗗悕绉�
+     * 渚涜揣鍟咺D
      */
-    @TableField(value = "supplier_name")
-    private String supplierName;
+    @TableField(value = "supplier_id")
+    private Long supplierId;
+
     /**
      * 鐓ょ
      */
-    @TableField(value = "coal")
-    private String coal;
+    @TableField(value = "coal_id")
+    private Long coalId;
     /**
      * 鍗曚綅
      */
@@ -81,14 +81,22 @@
      * 鐧昏浜篿d
      */
     @TableField(value = "registrant_id")
-    private String registrantId;
+    private Long registrantId;
+
     /**
      * 鐧昏鏃ユ湡
      */
     @TableField(value = "registration_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate registrationDate;
 
     /**
+     * 鐓よ川鏂规id
+     */
+    @TableField(value = "coal_plan_id")
+    private Long coalPlanId;
+
+    /**
      * 鍚堝苟id
      */
     @TableField(value = "merge_id")

--
Gitblit v1.9.3