代码合并

2024-09-20 17:43:27 +08:00
parent 546b63e336
commit 9e25471e1e
4 changed files with 7 additions and 12 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -147,10 +147,9 @@ public class TbPlaceController {
    public ResponseEntity<Object> getMasterId(
            @RequestParam Integer shopId,
            @RequestParam Long tableId,
-            @RequestParam(defaultValue = "") String useType,
-            @RequestParam(required = false) Integer vipUserId
+            @RequestParam(defaultValue = "") String useType
    ) {
-        return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, vipUserId, useType));
+        return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, useType));
    }

    @AnonymousAccess