From 18d292f1091b8b86ad29ba76e3cbe8ffaf2c222e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 六月 2025 17:45:39 +0800
Subject: [PATCH] 1.正式库合并以及优化 2.销售模块
---
basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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..0880eea 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,10 +1,14 @@
package com.ruoyi.basic.entity;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
-import java.util.Date;
+import java.time.LocalDate;
/**
* 鐓ょ淇℃伅琛� 瀹炰綋绫�
@@ -22,20 +26,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")
- private Date maintenanceDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate maintenanceDate;
}
\ No newline at end of file
--
Gitblit v1.9.3