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

优化

See merge request quanshu/mp-server!875

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -165,6 +165,7 @@ public class TicketBoxMgrController extends BaseApiController {
 
 		// 设置关联商品信息
 		QueryWrapper<TicketBoxGoods> ticketBoxGoodsQueryWrapper = new QueryWrapper<>();
+		ticketBoxGoodsQueryWrapper.eq("t1.box_id", param.getBoxId());
 		ticketBoxVO.setGoodsList(ticketBoxGoodsService.listByQueryWrapper(ticketBoxGoodsQueryWrapper));
 
 		// 设置经销商信息