Merge branch 'rem_scenic_device'

src/main/resources/mapper/TemplateMapper.xml

@@ -77,8 +77,8 @@
         delete from template_config where id = #{id}
     </delete>
     <select id="list" resultType="com.ycwl.basic.model.pc.template.resp.TemplateRespVO">
-        select t.*, s.name as scenic_name
-        from template t left join scenic s on s.id = t.scenic_id
+        select t.*
+        from template t
         <where>
             pid = 0
             <if test="scenicId!=null" >
@@ -94,13 +94,13 @@
         order by scenic_id, sort
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.template.resp.TemplateRespVO">
-        select t.*, s.name as scenic_name
-        from template t left join scenic s on s.id = t.scenic_id
+        select t.*
+        from template t
         where t.id = #{id}
     </select>
     <select id="getByPid" resultType="com.ycwl.basic.model.pc.template.resp.TemplateRespVO">
-        select t.*, s.name as scenic_name
-        from template t left join scenic s on s.id = t.scenic_id
+        select t.*
+        from template t
         where pid = #{id}
         order by sort
     </select>
@@ -114,10 +114,10 @@
         order by sort
     </select>
     <select id="listFor" resultType="com.ycwl.basic.model.mobile.scenic.content.ContentPageVO">
-        select t.id templateId, t.scenic_id, s.name as scenic_name, t.`name`, pid, t.cover_url templateCoverUrl,
+        select t.id templateId, t.scenic_id, t.`name`, pid, t.cover_url templateCoverUrl,
                0 as sourceType, sort,
                t.create_time, t.price
-        from template t left join scenic s on s.id = t.scenic_id
+        from template t
         where t.scenic_id = #{scenicId} and pid = 0 and t.status = 1
         order by sort
     </select>