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

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;
+
 }

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;
+
 }

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;
+
     /**
      * 运营端余额
      */