From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并

---
 admin-server/src/main/java/com/estate/expert/admin/domain/business/device/DeviceDto.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/DeviceDto.java b/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/DeviceDto.java
index 0779152..c7ee0f6 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/DeviceDto.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/DeviceDto.java
@@ -28,12 +28,12 @@
     @NotNull(message = "设备类型不能为空")
     DeviceType type;
 
-    @ApiModelProperty("设备编号")
-    @NotBlank(message = "设备编号不能为空")
-    String name;
-
     @ApiModelProperty("出厂编号")
     @NotBlank(message = "出厂编号不能为空")
+    String name;
+
+    @ApiModelProperty("设备编号")
+    @NotBlank(message = "设备编号不能为空")
     String manufacturerNumber;
 
     @ApiModelProperty("设备是否正在使用中")

--
Gitblit v1.7.1