From 43c631ad573535f4434caf19423824d4bd3f8ca7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 19 Jul 2023 13:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/entity/Device.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index f055d6b..de3dc87 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -129,6 +129,11 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0