Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/mapper/SinglePageMapper.xml

@@ -30,11 +30,9 @@
         select  a.id as id,
                 a.title as title,
                 a.link as link,
-                d.image as image
+                a.image as image
         from cm_page_image a
         right join cm_page_centre_image b on b.imageId=a.id
-        left join cm_page_image_activity c on c.imageId=a.id
-        left join actType d on d.actTypeId=c.actTypeId
         where b.centreId=#{floorId} and  a.enabledStatus=1
         order  by a.sort desc,a.createDate desc
     </select>