diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/CreateOrderDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/CreateOrderDTO.java
index 9b447ab4..ee6a793f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/CreateOrderDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/CreateOrderDTO.java
@@ -13,7 +13,7 @@ public class CreateOrderDTO {
     @NotNull
     private Integer shopId;
     @NotEmpty
-    private Long tableId;
+    private String tableId;
     private String note;
     private boolean postPay;
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PendingDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PendingDTO.java
index ab3f920a..5285b3e0 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PendingDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PendingDTO.java
@@ -11,7 +11,7 @@ public class PendingDTO {
     private String masterId;
     @NotNull
     private Integer shopId;
-    private Long tableId;
+    private String tableId;
     private Integer vipUserId;
     @NotNull
     private Boolean isPending;
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 405651ab..2bdb63b9 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
@@ -914,6 +914,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         pushConsMsg(orderInfo, cashierCarts);
 
         mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
+                .eq(TbShopTable::getShopId, createOrderDTO.getShopId())
                 .eq(TbShopTable::getQrcode, createOrderDTO.getTableId())
                 .set(TbShopTable::getStatus, TableStateEnum.USING.getState()));