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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml

@@ -128,4 +128,18 @@
  </select>
  
  
   <select id="query" resultMap="BaseResultMap">
     SELECT * FROM `yeshi_ec_red_pack_win_invite` d
   WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
      <if test="type != null">AND d.`rwr_type`= #{type}</if>
   ORDER BY d.rwr_id DESC
   LIMIT #{start},#{count}
  </select>
  
  <select id="count" resultType="Long">
     SELECT COUNT(DISTINCT d.`rwr_id`) FROM `yeshi_ec_red_pack_win_invite` d
   WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
      <if test="type != null">AND d.`rwr_type`= #{type}</if>
  </select>
  
</mapper>