From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
index 4f14fb0..9c2d75b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
@@ -14,7 +14,7 @@
 
 /**
  * <p>
- * 惠民卡协议配置 关联惠民卡协议管理
+ * 玩湃惠民卡协议配置 关联玩湃惠民卡协议管理
  * </p>
  *
  * @author jqs

--
Gitblit v1.7.1