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

src/main/resources/mapper/SecondHandMapper.xml

@@ -86,7 +86,7 @@
         <if test="userIdentity == 2">
             AND p.visibility IN (1,2,3)
         </if>
-        order by cshd.onLineDate desc
+        order by cshd.sold, cshd.onLineDate desc
     </select>
     <select id="getSecondHandDetail" resultType="com.caimei365.commodity.model.vo.SecondDetailVo">
         select