Merge branch 'developerF' into developer

src/main/resources/mapper/PageMapper.xml

@@ -827,7 +827,7 @@
                 </foreach>
             </if>
         </where>
-        order by p.sortIndex desc
+#         order by p.sortIndex desc
     </select>
 
     <select id="getNewFloor" resultType="com.caimei365.commodity.model.vo.ProductItemVo">