From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TerminalVO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TerminalVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TerminalVO.java
index fdc99d7..1aafffd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TerminalVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TerminalVO.java
@@ -15,13 +15,13 @@
     //  缁堢 IP 鍦板潃
     private String ip;
     //  缁堢闊抽噺(1-100)
-    private Integer volumn;
+    private Integer volume;
     //  缁堢鐧婚檰鐨勯粯璁ら煶閲�
-    private Integer defaultVolumn;
+    private Integer firstVol;
     //  缁堢鍔熸斁鐘舵��(寮�涓� 1銆佸叧涓� 0锛�
     private Integer power;
     //  缁堢鐧婚檰鐨勯粯璁ゅ姛鏀剧姸鎬�
-    private Integer defaultPower;
+    private Integer firstPower;
     //  绯荤粺淇濈暀
     private String context;
     //  缁堢鏈�杩戜竴娆$櫥闄嗘椂闂�

--
Gitblit v1.9.3