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

优化

See merge request quanshu/mp-server!652

mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -27,7 +27,7 @@
     </sql>
 
     <select id="listPrizeVO" resultType="com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO">
-        select t1.*, t2.*
+        select t1.*, t2.*,
             if(t2.prize_type = 'goods' AND t3.title is not null,t3.title,t2.title) as title,
             if(t2.prize_type = 'goods' AND t3.title is not null,t3.pic_url,t2.pic_url) as pic_url
         from mp_ticket_awards t1