From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java
index f8a17e0..e3b294a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java
@@ -22,9 +22,9 @@
/** 璁惧缂栧彿/鍥芥爣鐮� */
private String deviceId;
- @TableField("channel_id")
- /** 璁惧閫氶亾ID */
- private String channelId;
+ @TableField("device_name")
+ /** deviceName */
+ private String deviceName;
}
--
Gitblit v1.8.0