Authored by mali

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

@@ -124,6 +124,6 @@ @@ -124,6 +124,6 @@
124 124
125 <select id="selectFirstCode" resultType="java.lang.String" parameterType="java.lang.String" > 125 <select id="selectFirstCode" resultType="java.lang.String" parameterType="java.lang.String" >
126 select code from resources_pool_and_code 126 select code from resources_pool_and_code
127 - where status=1 and pool_id in (${poolIds}) and start_time &lt;= unix_timestamp(now()) and end_time &gt;= unix_timestamp(now()) order by update_time desc limit 0,1 127 + where status=1 and pool_id in (${poolIds}) and start_time &lt;= unix_timestamp(now()) and end_time &gt;= unix_timestamp(now()) order by update_time desc, id desc limit 0,1
128 </select> 128 </select>
129 </mapper> 129 </mapper>