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

优化

See merge request quanshu/mp-server!874

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

@@ -136,6 +136,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     if (CollectionUtils.isNotEmpty(param.getGoodsList())) {
       // 设置boxId和商品信息
       for (TicketBoxGoods ticketBoxGoods : param.getGoodsList()) {
+        ticketBoxGoods.setId(null);
         ticketBoxGoods.setBoxId(ticketBox.getBoxId());
         Goods goods = goodsService.getById(ticketBoxGoods.getRefId());
         if (goods != null) {