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

cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java

@@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -45,6 +46,11 @@ public class BkContactList implements Serializable {
      * 电话号码
      */
     private String phone;
+    /**
+     * 昵称
+     */
+    @Column(ignore = true)
+    private String nickName;
 
     /**
      * 历史订单数
@@ -56,7 +62,7 @@ public class BkContactList implements Serializable {
      * 取消数
      */
     @Column(ignore = true)
-    private Integer cannelNum;
+    private Integer cancelNum;
 
     /**
      * 最后一次预约时间

cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java

@@ -1,6 +1,7 @@
 package com.czg.order.vo;
 
 import lombok.Data;
+
 import java.util.List;
 
 /**
@@ -18,13 +19,15 @@ public class KitchenFoodVO {
 
     private String productName;
     private String skuName;
+    private Long categoryId;
+    String categoryName;
 
     private List<KitchenFoodItemVO> foodItems;
 
     record KitchenFoodItemVO(
-                                //员工名称
-            Long orderId,  String staffName,
-            String tableName,String areaName,Long orderDetailId,Long categoryId,String categoryName,
+            //员工名称
+            Long orderId, String staffName,
+            String tableName, String areaName, Long orderDetailId,
             //下单数    //菜品状态  待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT  已上菜 DELIVERED
             Long num, String subStatus,
             //下单时间            起菜时间                  出菜时间            上菜时间