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

src/main/resources/mapper/HomePageMapper.xml

@@ -176,6 +176,7 @@
           enabledStatus = '1'
           AND organizeID = #{organizeID}
         ORDER BY
-          IF(ISNULL(sort),1,0) ASC
+          IF(ISNULL(sort),1,0) ASC,
+          sort ASC
     </select>
 </mapper>