Merge branch 'luck_draw_feature' into dev

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityAttendanceRecordMapper.xml

@@ -58,7 +58,7 @@
         from activity_popularize_relation where `popularize_id`=#{activityId}
         group by major_user_id) as `apr` on apr.major_user_id = apu.user_id
         left join (select `user_id`, `activity_id`, group_concat(`prize_name`) as `prizes`
-        from `activity_winning_record` where `activity_id`=#{activityId}
+        from `activity_winning_record` where `activity_id`=#{activityId} and `has_winning`=1
         group by user_id, `activity_id`) as `awr`
         on awr.user_id = apu.user_id and awr.activity_id = apu.popularize_id
         order by apu.current_progress desc