From b6e16a8c60707cf97103c9906712e936de9fea11 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 29 Jul 2024 18:33:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6master=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/youlai/system/common/base/BaseEntity.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/youlai/system/common/base/BaseEntity.java b/src/main/java/com/youlai/system/common/base/BaseEntity.java
index d6a89e8d..89320fd2 100644
--- a/src/main/java/com/youlai/system/common/base/BaseEntity.java
+++ b/src/main/java/com/youlai/system/common/base/BaseEntity.java
@@ -1,8 +1,6 @@
 package com.youlai.system.common.base;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
@@ -25,6 +23,12 @@ public class BaseEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
     /**
      * 创建时间
      */
@@ -41,9 +45,4 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    /**
-     * 逻辑删除标识 (0-未删除 1-已删除)
-     */
-    @TableLogic(value = "0", delval = "1")
-    private Integer isDeleted;
 }

From dbbed0c74a23a1e138288bbecb2a4908cdd34b01 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 30 Jul 2024 10:56:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20LocalDateTime=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/youlai/system/config/JacksonConfig.java | 17 -----------------
 .../com/youlai/system/config/WebMvcConfig.java  |  5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 src/main/java/com/youlai/system/config/JacksonConfig.java

diff --git a/src/main/java/com/youlai/system/config/JacksonConfig.java b/src/main/java/com/youlai/system/config/JacksonConfig.java
deleted file mode 100644
index d7e3571d..00000000
--- a/src/main/java/com/youlai/system/config/JacksonConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.youlai.system.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class JacksonConfig {
-
-    @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
-        return objectMapper;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/config/WebMvcConfig.java b/src/main/java/com/youlai/system/config/WebMvcConfig.java
index f97f8010..6dee3948 100644
--- a/src/main/java/com/youlai/system/config/WebMvcConfig.java
+++ b/src/main/java/com/youlai/system/config/WebMvcConfig.java
@@ -2,8 +2,10 @@ package com.youlai.system.config;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import jakarta.validation.ValidatorFactory;
@@ -39,7 +41,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
         MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
         ObjectMapper objectMapper = jackson2HttpMessageConverter.getObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+
         objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
+        objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
 
         // 后台Long值传递给前端精度丢失问题（JS最大精度整数是Math.pow(2,53)）
         SimpleModule simpleModule = new SimpleModule();