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/Device.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/Device.java b/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/Device.java
index e354065..bb69b44 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/Device.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/business/device/Device.java
@@ -11,10 +11,10 @@
import java.util.Map;
/**
- *
+ *
* @TableName device 设备管理
*
- * 编号(对应name)
+ * 出厂编号(对应name)
*/
@Getter
@Setter
@@ -28,7 +28,7 @@
private DeviceType type;
/**
- * 出厂编号
+ * 设备编号
*/
@Column(nullable = false)
private String manufacturerNumber;
@@ -55,6 +55,6 @@
@Override
public String getOptionName() {
// return String.format("%s - %s", getName(), type.getDesc());
- return getName();
+ return getManufacturerNumber();
}
}
\ No newline at end of file
--
Gitblit v1.7.1