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

This commit is contained in:
张松
2025-12-02 14:35:00 +08:00
9 changed files with 128 additions and 8 deletions

View File

@@ -26,7 +26,7 @@ public interface KitchenDetailMapper {
List<KitchenTableFoodVO> getKitchenTableFoods(Long shopId, Long orderId, String tableCode, Long isNoTable);
/**
* 按台桌查看商品列表
* 按商品查看
*/
List<KitchenFoodVO> getKitchenFood(Long shopId, String productName, Long categoryId);
}

View File

@@ -19,7 +19,7 @@
`staff`.`name` AS staffName,
sum(detail.num - detail.return_num) AS num,
detail.sub_status AS subStatus,
detail.order_time AS orderTime,
detail.create_time AS orderTime,
detail.start_order_time AS startOrderTime,
detail.dish_out_time AS dishOutTime,
detail.food_serve_time AS foodServeTime
@@ -90,7 +90,7 @@
detail.sku_name AS skuName,
sum(detail.num - detail.return_num) AS num,
detail.sub_status AS subStatus,
detail.order_time AS orderTime,
detail.create_time AS orderTime,
detail.start_order_time AS startOrderTime,
detail.dish_out_time AS dishOutTime,
detail.food_serve_time AS foodServeTime