From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPopEditDto.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPopEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPopEditDto.java
index 09bcc29..f712e86 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPopEditDto.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPopEditDto.java
@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
/**
* @ClassName MgtpopEditDto
* @Description TODO
@@ -28,8 +26,11 @@
@ApiModelProperty(value = "链接地址")
private String linkUrl;
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
+ @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂6.赚取积分7.建议有奖")
private Integer jumpType;
+
+ @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ private Integer linkType;
@ApiModelProperty(value = "跳转id")
private String jumpId;
@@ -38,9 +39,9 @@
private Integer popSort;
@ApiModelProperty(value = "展示开始时间 yyyy-MM-dd")
- private Date showStartTime;
+ private String showStartTime;
@ApiModelProperty(value = "展示结束时间 yyyy-MM-dd")
- private Date showEndTime;
+ private String showEndTime;
}
--
Gitblit v1.7.1