From 5fa4c1db3141099be4ca176cdf2f3ec10f46c141 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 09 Mar 2022 11:36:02 +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