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

优化

See merge request quanshu/mp-server!948

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

@@ -67,7 +67,7 @@
              left join mp_ticket_box_goods t2 on t1.box_id = t2.box_id
              left join mp_goods t3 on t2.ref_id = t3.goods_id
              left join mp_coupon t4 on t2.ref_id = t4.coupon_id
-             left join mp_coupon_pkg t5 on t1.ref_id = t5.id
+             left join mp_coupon_pkg t5 on t2.ref_id = t5.id
 
       ${ew.customSqlSegment}
   </select>