From 4a4db8924da0782d0b698f7585ad6b0577bdca2d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 10:09:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/Device.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Device.java b/screen-manage/src/main/java/com/moral/api/entity/Device.java
index ccf7d28..0fb249f 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Device.java
@@ -145,6 +145,8 @@
* */
@TableField(exist = false)
private Version version;
-
-
+ /*
+ *������
+ * */
+ private Integer devNum;
}
--
Gitblit v1.8.0