Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!362

mp-service/src/main/resources/mapper/user/UserHitPrizeMapper.xml

@@ -30,13 +30,15 @@
                  LEFT JOIN sys_user su ON muhp.user_id = su.user_id
         WHERE muhp.prize_id != ''
         AND muhp.user_id != #{userId}
-        AND ((mtap.prize_type = 'coin' AND mtap.quantity >= 100) OR mtap.prize_type='goods')
+        AND ((mtap.prize_type = 'coin' AND mtap.value >= 100) OR mtap.prize_type='goods')
         ORDER BY muhp.created_time DESC
         LIMIT 20
     </select>
 
     <select id="selectTicketHitPrizeBarrageByUserId" resultType="com.qs.mp.user.domain.vo.TicketHitPrizeBarrageVO">
-        SELECT su.nick_name,su.avatar,mtap.title
+        SELECT su.nick_name nickName,
+                su.avatar avatar,
+                mtap.title prizeInfo
         FROM mp_user_hit_prize muhp
                  LEFT JOIN mp_ticket_awards_prize mtap ON muhp.prize_id = mtap.prize_id
                  LEFT JOIN sys_user su ON muhp.user_id = su.user_id