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 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 175167c..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
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,12 +39,21 @@
      * 协议名称
      */
     @TableField("agreementName")
+    @ApiModelProperty("协议名称")
     private String agreementName;
     /**
      *协议内容
      */
+    @ApiModelProperty("协议内容")
+
     @TableField("agreementContent")
     private String agreementContent;
+    /**
+     *协议管理id
+     */
+    @ApiModelProperty("协议管理id")
+    @TableField("agreementId")
+    private Integer agreementId;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1