From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 eebb6e0..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
@@ -33,6 +33,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @TableField("agreementId")
+ private Integer agreementId;
/**
* 协议名称
*/
@@ -46,16 +48,10 @@
@TableField("agreementContent")
private String agreementContent;
- /**
- *协议管理id
- */
- @ApiModelProperty("协议管理id")
- @TableField("agreementId")
- private Integer agreementId;
-
@Override
protected Serializable pkVal() {
return this.id;
}
+
}
--
Gitblit v1.7.1