From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/Device.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 c978a90..081e6ff 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
@@ -135,11 +135,19 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
+
/*
* ������������
* */
@TableField(exist = false)
private Version version;
-
+ /*
+ *������
+ * */
+ private Integer devNum;
}
--
Gitblit v1.8.0