Authored by qinchao

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3

@@ -18,6 +18,6 @@ @@ -18,6 +18,6 @@
18 <if test="wordType != null"> 18 <if test="wordType != null">
19 AND word_type = #{wordType, jdbcType=INTEGER} 19 AND word_type = #{wordType, jdbcType=INTEGER}
20 </if> 20 </if>
21 - order by order_by DESC LIMIT 20 21 + order by order_by DESC, create_time DESC LIMIT 20
22 </select> 22 </select>
23 </mapper> 23 </mapper>