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/dto/ErrorMsgDto.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java
index 143c1fb..6931129 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java
@@ -33,9 +33,12 @@
     private LocalDateTime ErrorTime;
 
     /**
-     * 璁惧绫诲瀷   0锛氬崟鐏�  1锛氬厖鐢垫々 2锛氬ぇ姘�
+     * 璁惧绫诲瀷   1-鍗曠伅銆�2-澶ф皵銆�3-鍏呯數妗�
      */
     private Integer DeviceType;
 
+    /**
+     * 璁惧鐨刯son鏍煎紡淇℃伅
+     */
     private String DeviceJson;
 }

--
Gitblit v1.9.3