From f9e7387c856feab98f8219b398d05d06b844588d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 14:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java    | 4 ++++
 .../src/main/java/com/czg/account/entity/ShopConfig.java      | 4 ++--
 2 files changed, 6 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 9c247086d..eaa6cee31 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
@@ -54,6 +54,10 @@ public class ShopInfoEditDTO {
      * 是否开启会员余额支付
      */
     private Integer isAccountPay;
+    /**
+     * 是否启用满减活动 1-是 0-否
+     */
+    private Integer isEnableDiscount;
 
     /**
      * 台桌预订短信
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 876690017..4c533c0e0 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
@@ -43,8 +43,8 @@ public class ShopConfig implements Serializable {
 	*/
 	private Integer isEnableConsSync;
 	/**
-	* 是否启用新客立减 1-是 0-否
-	*/
+	 * 是否启用满减活动 1-是 0-否
+	 */
 	private Integer isEnableDiscount;
 	/**
 	* 是否允许账号登录 1-是 0-否