From 680c24d2a203070c8cb644df30ada4d193683b3e Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 9 Oct 2024 14:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E8=BF=94=E5=9B=9E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E8=AE=A2=E5=8D=95=E5=8F=96=E9=A4=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 716dca5e..922a9eb9 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -241,6 +241,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
             itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId());
             itemMap.put("useType", orderInfo == null ? null : orderInfo.getUseType());
+            itemMap.put("masterId", orderInfo == null ? null : orderInfo.getMasterId());
             infoList.add(itemMap);
         }
         int i = tbShopTableRepository.countAllByShopId(criteria.getShopId());