From 5af799118134eb1f77bb310433825fe7cf11e680 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 01 四月 2025 16:57:35 +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 | 10 +---------
1 files changed, 1 insertions(+), 9 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 4dd3978..4800e9c 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
@@ -33,8 +33,6 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @TableField("agreementId")
- private Integer agreementId;
/**
* 协议名称
*/
@@ -48,16 +46,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