Merge remote-tracking branch 'origin/developer' into developerD

src/main/resources/mapper/PageMapper.xml

@@ -120,8 +120,7 @@
     </select>
     <select id="getFloorImageByCentreId" resultType="com.caimei365.commodity.model.vo.FloorImageVo">
         select
-        id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort,
-        displaySort, createDate, content
+        id, floorId, centreId, productId, name, link, image, appletsImage,adsImage, label,content, pcStatus, appletsStatus, sort,displaySort, createDate
         from new_page_floor_image
         where centreId = #{id}
         <if test="source == 1">