From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
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