Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
Tankaikai
2024-10-21 13:57:03 +08:00

View File

@@ -1838,7 +1838,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override
public Object printOrder(BaseTableDTO baseTableDTO) {
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(baseTableDTO.getTableId(), baseTableDTO.getTableId());
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(baseTableDTO.getShopId(), baseTableDTO.getTableId());
Integer currentOrderId = getCurrentOrderId(shopEatTypeInfoDTO);
if (currentOrderId == null) {