From fd68d9efbe525e9210f7013c1f103f197f01841c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/entity/Supervision.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Supervision.java b/screen-api/src/main/java/com/moral/api/entity/Supervision.java
index 17f4a4f..a89e3fa 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Supervision.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Supervision.java
@@ -33,11 +33,21 @@
private Integer id;
/**
+ * ������id
+ */
+ private Integer organizationId;
+
+ /**
* ������������
*/
private Integer cityCode;
/**
+ * ������������
+ */
+ private String cityName;
+
+ /**
* ������
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
--
Gitblit v1.8.0