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

# Conflicts:
#	src/main/resources/mapper/PageMapper.xml

src/main/resources/mapper/PageMapper.xml

@@ -827,6 +827,7 @@
                 </foreach>
             </if>
         </where>
+        order by p.sortIndex desc
     </select>
 
     <select id="getNewFloor" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
@@ -872,7 +873,7 @@
             and p.validFlag = 2
         </where>
 
-
+        #         order by p.combinationSort != 0 desc, p.combinationSort asc
         # 		在设置重点关注时给排序值1000为了让重点关注始终在列表前端
         <if test="sortIndex==1000">
             ORDER BY p.newshowTime DESC