From a461d5fc184fd0129a0eb5a5b3e34f67d75cc6a2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 04 六月 2025 16:51:59 +0800
Subject: [PATCH] 联调基础信息

---
 basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
index dd86849..934495c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
@@ -1,6 +1,7 @@
 package com.ruoyi.basic.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.ruoyi.common.core.domain.MyBaseEntity;
 
@@ -22,20 +23,21 @@
      * 涓婚敭ID
      */
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 鐓ょ鍚嶇О
      */
-    @TableField(value = "coal_name")
-    private String coalName;
+    @TableField(value = "coal")
+    private String coal;
     /**
      * 缁存姢浜哄鍚�
      */
-    @TableField(value = "maintainer")
-    private String maintainer;
+    @TableField(value = "maintainer_id")
+    private Long maintainerId;
     /**
      * 缁存姢鏃ユ湡
      */
     @TableField(value = "maintenance_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date maintenanceDate;
 }
\ No newline at end of file

--
Gitblit v1.9.3