From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/resources/mapper/SupervisionMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/SupervisionMapper.xml b/screen-api/src/main/resources/mapper/SupervisionMapper.xml
index 7db5524..7255ee5 100644
--- a/screen-api/src/main/resources/mapper/SupervisionMapper.xml
+++ b/screen-api/src/main/resources/mapper/SupervisionMapper.xml
@@ -5,7 +5,9 @@
     <!-- ������������������������ -->
     <resultMap id="BaseResultMap" type="com.moral.api.entity.Supervision">
         <id column="id" property="id"/>
+        <result column="organization_id" property="organizationId"/>
         <result column="city_code" property="cityCode"/>
+        <result column="city_name" property="cityName"/>
         <result column="time" property="time"/>
         <result column="supervisee_unit" property="superviseeUnit"/>
         <result column="number" property="number"/>

--
Gitblit v1.8.0