Merge branch 'dev' into 'master'

按发布时间倒序排序

See merge request !6

cloud-site-service/src/main/resources/mapper/InformationMapper.xml

@@ -306,8 +306,8 @@
                 <!--#{item}-->
                 <!--</foreach>-->
             ORDER BY
-                a.is_top DESC,
                 a.release_time DESC,
+                a.is_top DESC,
                 a.id
     </select>
     <select id="informationClassifyPcPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO">
@@ -347,8 +347,8 @@
 		            and a.type_three=#{typeTwo}
 		        </if>
             ORDER BY
-                a.is_top DESC,
                 a.release_time DESC,
+           	    a.is_top DESC,
                 a.id
     </select>