From 010f4ba252db180fc7fea4d7cb1b84a0bca7479f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:37:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral 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