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

admin

2019-12-18 40f62c05bddb661aeb621820660070d88d935861

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

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

@@ -108,10 +108,10 @@
  </select>
  
  <select id="getWinTopListByBossId" resultMap="BaseResultMap">
      SELECT SUM(d.`rwr_money`)AS rwr_money,d.`rwr_team_uid` FROM `yeshi_ec_red_pack_win_invite` d
      SELECT SUM(d.`rwr_money`)AS rwr_money,d.`rwr_team_uid`,MIN(d.`rwr_id`) AS orderId FROM `yeshi_ec_red_pack_win_invite` d
    WHERE d.`rwr_uid` = #{uid} AND d.`rwr_type` <![CDATA[<>]]> 'newUserReward'
    GROUP BY d.`rwr_team_uid`
    ORDER BY rwr_money DESC
    ORDER BY orderId
    LIMIT #{start},#{count}
  </select>