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

优化

See merge request quanshu/mp-server!950

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -146,6 +146,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
             for (TicketBoxGoods ticketBoxGoods : param.getGoodsList()) {
                 TicketBoxGoods boxGoods = new TicketBoxGoods();
                 BeanUtils.copyProperties(ticketBoxGoods, boxGoods);
+                boxGoods.setId(null);
                 boxGoods.setBoxId(ticketBox.getBoxId());
                 if (TicketBoxGoodsTypeEnum.COUPON.equals(ticketBoxGoods.getType())) {
                     Coupon coupon = couponService.getById(boxGoods.getRefId());