From 7620ecb888eafa34e11c054a705e2dc56e0db6e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 31 三月 2025 11:52:38 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
index 750f03b..c0fd57a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
@@ -1,8 +1,5 @@
package com.dsh.course.feignClient.activity.model;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
@@ -28,27 +25,28 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 运营商id 选择默认传null
*/
- @TableField("operatorId")
private Integer operatorId;
/**
*添加人员说明文案
*/
- @TableField("addUserRemark")
private String addUserRemark;
/**
*选择人员说明文案
*/
- @TableField("selectUserRemark")
private String selectUserRemark;
+ /**
+ * 门店无惠民卡介绍页
+ */
+ private String storeNoHuiminCardIntro;
private String agreementSettings;
private List<THuiminAgreementSetting> tHuiminAgreementSettingList;
+ private Integer objectType;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1