From 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 八月 2025 15:22:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
ruoyi-system/src/main/java/com/ruoyi/basic/entity/Province.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/basic/entity/Province.java b/ruoyi-system/src/main/java/com/ruoyi/basic/entity/Province.java
index f818f8f..4ba71d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/basic/entity/Province.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/basic/entity/Province.java
@@ -1,8 +1,11 @@
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.BaseEntity;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 鐪佽〃 瀹炰綋绫�
@@ -12,7 +15,7 @@
*/
@Data
@TableName("province")
-public class Province extends BaseEntity {
+public class Province implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,4 +29,14 @@
*/
@TableField(value = "name")
private String name;
+
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
}
\ No newline at end of file
--
Gitblit v1.9.3