From 7b53ebc0ade798c4276fb694567fafde70b8e749 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 27 Nov 2025 13:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=20=E4=B8=8A=E8=8F=9C?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/account/dto/shopinfo/ShopInfoEditDTO.java | 11 ++++++++++-
 .../main/java/com/czg/account/entity/ShopConfig.java  | 10 +++++++++-
 .../main/java/com/czg/account/entity/ShopInfo.java    | 11 +++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
index d03c4080a..4ed77d20b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
@@ -1,6 +1,5 @@
 package com.czg.account.dto.shopinfo;
 
-import com.mybatisflex.annotation.Column;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -276,4 +275,14 @@ public class ShopInfoEditDTO {
      */
     private Long orderFenceDistance;
 
+
+    /**
+     * 上菜分钟控制开关 1-是 0-否
+     */
+    private Integer isServeTimeControl;
+    /**
+     * 上菜时间 分钟
+     */
+    private Integer serveTime;
+
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
index 459972b3a..bd2e7077a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
@@ -1,6 +1,5 @@
 package com.czg.account.entity;
 
-import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
@@ -116,4 +115,13 @@ public class ShopConfig implements Serializable {
 	 */
 	private Integer orderFenceDistance;
 
+	/**
+	 * 上菜分钟控制开关 1-是 0-否
+	 */
+	 private Integer isServeTimeControl;
+	/**
+	 * 上菜时间 分钟
+	 */
+	private Integer serveTime;
+
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
index 6bf47a4cf..2ef59fba5 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
@@ -345,6 +345,17 @@ public class ShopInfo implements Serializable {
     @Column(ignore = true)
     private Long orderFenceDistance;
 
+    /**
+     * 上菜分钟控制开关 1-是 0-否
+     */
+    @Column(ignore = true)
+    private Integer isServeTimeControl;
+    /**
+     * 上菜时间 分钟
+     */
+    @Column(ignore = true)
+    private Integer serveTime;
+
     /**
      * 运营端余额
      */