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/THuiminAgreement.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 6a11d14..e290a4f 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
@@ -16,7 +16,7 @@
/**
* <p>
- * 惠民卡协议管理
+ * 玩湃惠民卡协议管理
* </p>
*
* @since 2023-07-12
@@ -25,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_huimin_agreement")
-@ApiModel(value = "THuiminAgreement对象", description = "惠民卡协议管理")
+@ApiModel(value = "THuiminAgreement对象", description = "玩湃惠民卡协议管理")
public class THuiminAgreement extends Model<THuiminAgreement> {
private static final long serialVersionUID = 1L;
/**
@@ -40,6 +40,7 @@
@ApiModelProperty("运营商id")
private Integer operatorId;
+
/**
*添加人员说明文案
*/
@@ -53,18 +54,19 @@
@TableField("selectUserRemark")
private String selectUserRemark;
/**
- * 门店无惠民卡介绍页
+ * 门店无玩湃惠民卡介绍页
*/
@TableField("storeNoHuiminCardIntro")
- @ApiModelProperty("门店无惠民卡介绍页")
-
+ @ApiModelProperty("门店无玩湃惠民卡介绍页")
private String storeNoHuiminCardIntro;
@TableField(exist = false)
private Integer objectType;
+ @TableField(exist = false)
+ private String agreementSettings;
@TableField(exist = false)
- private List<THuiminAgreementSetting> tHuiminAgreementSettingList;
+ private List<THuiminAgreementSetting> settingList;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1