Authored by mali

Merge branch 'master' into test6.9.18

@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 limit #{rowNo},#{limit} 57 limit #{rowNo},#{limit}
58 </select> 58 </select>
59 <select id="selectTotalInboxs" resultType="java.lang.Integer"> 59 <select id="selectTotalInboxs" resultType="java.lang.Integer">
60 - select count(1) from ${tableName} force index(`read`) where uid = #{uid} and is_del='N' 60 + select count(1) from ${tableName} where uid = #{uid} and is_del='N'
61 <if test="type != null"> 61 <if test="type != null">
62 and type=#{type} 62 and type=#{type}
63 </if> 63 </if>