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

src/main/resources/mapper/PageMapper.xml

@@ -103,7 +103,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, createDate
+            id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort, displaySort, createDate
         from new_page_floor_image
         where centreId = #{id}
         <if test="source == 1">