From 6cb4ebd3c59e585d546a3e66672fb7f3029a06f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 四月 2025 15:44:11 +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/THuiminAgreement.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
index 7bd27ae..c392e2c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
@@ -5,11 +5,14 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.List;
/**
* <p>
@@ -22,6 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_huimin_agreement")
+@ApiModel(value = "THuiminAgreement对象", description = "惠民卡协议管理")
public class THuiminAgreement extends Model<THuiminAgreement> {
private static final long serialVersionUID = 1L;
/**
@@ -33,17 +37,36 @@
* 运营商id 选择默认传null
*/
@TableField("operatorId")
+ @ApiModelProperty("运营商id")
+
private Integer operatorId;
+
/**
*添加人员说明文案
*/
@TableField("addUserRemark")
+ @ApiModelProperty("添加人员说明文案")
private String addUserRemark;
/**
*选择人员说明文案
*/
+ @ApiModelProperty("选择人员说明文案")
@TableField("selectUserRemark")
private String selectUserRemark;
+ /**
+ * 门店无惠民卡介绍页
+ */
+ @TableField("storeNoHuiminCardIntro")
+ @ApiModelProperty("门店无惠民卡介绍页")
+ private String storeNoHuiminCardIntro;
+
+ @TableField(exist = false)
+ private Integer objectType;
+ @TableField(exist = false)
+ private String agreementSettings;
+
+ @TableField(exist = false)
+ private List<THuiminAgreementSetting> settingList;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1