From 562926922386bb24070ea27eb5a27193c41e996b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 2630278..d667591 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -90,7 +90,7 @@
 
     @ValueTableShow(6)
     @ApiModelProperty(value = "璁惧鐘舵��")
-    private String deviceStatus;
+    private Integer deviceStatus;
 
     @ValueTableShow(19)
     @ApiModelProperty(value = "瀛樻斁鐐�")

--
Gitblit v1.9.3