From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 b3bba16..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
@@ -5,6 +5,8 @@
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;
@@ -23,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;
/**
@@ -34,28 +37,33 @@
* 运营商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 List<THuiminAgreementSetting> tHuiminAgreementSettingList;
+ private List<THuiminAgreementSetting> settingList;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1