From 134c17a2bda8c58f2c9a080fb94ff137133f2b4c Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Wed, 25 Jun 2025 15:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E4=B8=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fuyuanshen/modules/system/domain/Device.java     | 2 ++
 fys-system/src/main/resources/config/application.yml          | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fys-system/src/main/java/com/fuyuanshen/modules/system/domain/Device.java b/fys-system/src/main/java/com/fuyuanshen/modules/system/domain/Device.java
index b0610fe..a300f0b 100644
--- a/fys-system/src/main/java/com/fuyuanshen/modules/system/domain/Device.java
+++ b/fys-system/src/main/java/com/fuyuanshen/modules/system/domain/Device.java
@@ -6,6 +6,7 @@ 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.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.fuyuanshen.base.BaseEntity;
@@ -20,6 +21,7 @@ import java.io.Serializable;
  **/
 @Data
 @TableName("device")
+@JsonInclude(JsonInclude.Include.ALWAYS) // 关键注解
 public class Device extends BaseEntity implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
diff --git a/fys-system/src/main/resources/config/application.yml b/fys-system/src/main/resources/config/application.yml
index 3cfdcbb..edcc540 100644
--- a/fys-system/src/main/resources/config/application.yml
+++ b/fys-system/src/main/resources/config/application.yml
@@ -43,8 +43,8 @@ spring:
     multipart:
       max-file-size: 5MB        # 设置单个上传文件的最大大小为10MB
       max-request-size: 5MB
-#  jackson:
-#    default-property-inclusion: non_null
+  jackson:
+    default-property-inclusion: always
 #  pid:
 #    file: /自行指定位置/eladmin.pid