From f4894c44735012e51b7f3ade126b5bf9d7757202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java | 3 +--
1 files changed, 1 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..bdc037f 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
@@ -57,14 +57,13 @@
*/
@TableField("storeNoHuiminCardIntro")
@ApiModelProperty("门店无惠民卡介绍页")
-
private String storeNoHuiminCardIntro;
@TableField(exist = false)
private Integer objectType;
@TableField(exist = false)
- private List<THuiminAgreementSetting> tHuiminAgreementSettingList;
+ private List<THuiminAgreementSetting> settingList;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1