From 38de8b03ac3689e8779fd75fae4f0628464d023b Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 17 八月 2024 15:34:01 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 8073eef..87a0230 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -38,7 +38,15 @@
@ApiModelProperty(value = "优惠券名称")
@TableField("name")
private String name;
-
+
+ @ApiModelProperty(value = "封面图")
+ @TableField("cover_picture")
+ private String coverPicture;
+
+ @ApiModelProperty(value = "详情图片")
+ @TableField("details_picture")
+ private String detailsPicture;
+
@ApiModelProperty(value = "优惠方式（1=满减，2=抵扣）")
@TableField("preferential_mode")
private Integer preferentialMode;
@@ -98,13 +106,6 @@
@ApiModelProperty(value = "优惠券说明")
@TableField("explain")
private String explain;
-
- @ApiModelProperty(value = "封面图")
- @TableField("cover_picture")
- private String coverPicture;
- @ApiModelProperty(value = "详情图片")
- @TableField("details_picture")
- private String detailsPicture;
@ApiModelProperty(value = "说明")
@TableField("remark")
--
Gitblit v1.7.1