From b2986e54e87d2d3f0cdd52ff7442f3bb150f8d4d Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 24 May 2023 18:42:07 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mappers/TerminalPhotoDao.xml         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index 7e53250..ab6fb11 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -36,6 +36,8 @@
 
     <resultMap id="PhotoMarkMap" type="com.shxy.xymanager_common.dto.PhotoMarkDto">
         <result column="id" jdbcType="INTEGER" property="markId"/>
+        <result column="term_id" jdbcType="INTEGER" property="termId"/>
+        <result column="channel_id" jdbcType="INTEGER" property="channelId"/>
         <result column="width" jdbcType="INTEGER" property="width"/>
         <result column="mark_id" jdbcType="INTEGER" property="markId"/>
         <result column="height" jdbcType="INTEGER" property="height"/>
@@ -463,6 +465,8 @@
 
     <select id="selectPhotoMark" resultMap="PhotoMarkMap" parameterType="com.shxy.xymanager_common.vo.MarkReqVo">
         select
+        tpm.term_id as term_id,
+        tpm.channel_id as channel_id,
         tpm.id as id,
         tpm.width as width,
         tpm.height as height,
@@ -487,6 +491,8 @@
 
     <select id="selectPhotoWithoutPic" resultMap="PhotoMarkMap" parameterType="com.shxy.xymanager_common.vo.MarkReqVo">
         select
+        tpm.term_id as term_id,
+        tpm.channel_id as channel_id,
         tpm.id as id,
         tpm.width as width,
         tpm.height as height,