From ee2d9a4049baa9ecc3f43d0576fd3745688171be Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 02 Aug 2023 13:40:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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