From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/Device.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 beec53d..401ade5 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
@@ -135,6 +135,11 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
+
/*
* ������������
* */
--
Gitblit v1.8.0