From 7e5452d35bb30dad5bc9e37360047b5a43732dcd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev

---
 screen-api/src/main/java/com/moral/api/entity/Device.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java
index 401ade5..12992b6 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -146,7 +146,10 @@
     @TableField(exist = false)
     private Version version;
 
-
+    /*
+     * ������
+     * */
+    private Integer devNum;
 
 
 }

--
Gitblit v1.8.0