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

This commit is contained in:
张松
2025-11-28 16:46:33 +08:00
6 changed files with 24 additions and 9 deletions

View File

@@ -18,6 +18,8 @@ public class BkTableVO {
public static class TableVO {
private Long tableId;
private String tableName;
private String tableStatus;
private Integer tableUserNum;
private List<BkOrder> bkOrders;
}

View File

@@ -24,7 +24,7 @@ public class KitchenFoodVO {
record KitchenFoodItemVO(
//员工名称
Long orderId, String staffName,
String tableName,String areaName,Long orderDetailId,
String tableName,String areaName,Long orderDetailId,Long categoryId,String categoryName,
//下单数 //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED
Long num, String subStatus,
//下单时间 起菜时间 出菜时间 上菜时间