From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 10:02:52 +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 | 4 +++-
1 files changed, 3 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 8352ec6..4dd3978 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
@@ -23,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("t_points_merchandise_city")
+@TableName("t_huimin_agreement_setting")
public class THuiminAgreementSetting extends Model<THuiminAgreementSetting> {
private static final long serialVersionUID = 1L;
@@ -33,6 +33,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @TableField("agreementId")
+ private Integer agreementId;
/**
* 协议名称
*/
--
Gitblit v1.7.1