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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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..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
@@ -40,6 +40,7 @@
@ApiModelProperty("运营商id")
private Integer operatorId;
+
/**
*添加人员说明文案
*/
@@ -57,14 +58,15 @@
*/
@TableField("storeNoHuiminCardIntro")
@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