From dd532f9f8c6275246161d795a6584ee8ee577d4e Mon Sep 17 00:00:00 2001
From: wangrunpu <2095588299@qq.com>
Date: Wed, 21 Jan 2026 10:43:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=A4=E5=B0=98=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94=E7=89=A9=E8=81=94=E7=BD=91?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/dustequipinfo/vo/DustEquipinfoPageReqVO.java       | 3 +++
 .../admin/dustequipinfo/vo/DustEquipinfoRespVO.java          | 4 ++++
 .../admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java       | 4 ++++
 .../system/dal/dataobject/dustequipinfo/DustEquipinfoDO.java | 5 +++++
 .../src/main/resources/application.yaml                      | 4 ++--
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoPageReqVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoPageReqVO.java
index d95394038..f09435ebb 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoPageReqVO.java
@@ -17,6 +17,9 @@ public class DustEquipinfoPageReqVO extends PageParam {
     @Schema(description = "设备编码")
     private String equipCode;
 
+    @Schema(description = "物联网设备")
+    private Long iotDeviceId;
+
     @Schema(description = "设备名称", example = "张三")
     private String equipName;
 
diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java
index 5394a4552..074fe70f4 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java
@@ -23,6 +23,10 @@ public class DustEquipinfoRespVO {
     @ExcelProperty("设备编码")
     private String equipCode;
 
+    @Schema(description = "物联网设备", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("物联网设备")
+    private Long iotDeviceId;
+
     @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @ExcelProperty("设备名称")
     private String equipName;
diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java
index 784b2cb26..f97e9cce9 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java
@@ -19,6 +19,10 @@ public class DustEquipinfoSaveReqVO {
     @NotEmpty(message = "设备编码不能为空")
     private String equipCode;
 
+    @Schema(description = "物联网设备", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物联网设备不能为空")
+    private Long iotDeviceId;
+
     @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @NotEmpty(message = "设备名称不能为空")
     private String equipName;
diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dustequipinfo/DustEquipinfoDO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dustequipinfo/DustEquipinfoDO.java
index ceb2ebf0d..3eaab5983 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dustequipinfo/DustEquipinfoDO.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dustequipinfo/DustEquipinfoDO.java
@@ -33,6 +33,11 @@ public class DustEquipinfoDO extends BaseDO {
      * 设备编码
      */
     private String equipCode;
+
+    /**
+     * 物联网设备
+     */
+    private Long iotDeviceId;
     /**
      * 设备名称
      */
diff --git a/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml b/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml
index 08c96286c..7c9a8f6b6 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml
+++ b/yudao-module-system/yudao-module-system-server/src/main/resources/application.yaml
@@ -48,10 +48,10 @@ logging:
 
 springdoc:
   api-docs:
-    enabled: false # 1. 是否开启 Swagger 接文档的元数据
+    enabled: true # 1. 是否开启 Swagger 接文档的元数据
     path: /v3/api-docs
   swagger-ui:
-    enabled: false # 2.1 是否开启 Swagger 文档的官方 UI 界面
+    enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面
     path: /swagger-ui
   default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档