From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
index be346ae..7888a81 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.system;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -12,7 +13,12 @@
*
*/
@Table("yeshi_ec_system_coupon")
-public class SystemCoupon {
+public class SystemCoupon implements Serializable{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
// 鍒哥被鍨�
public enum CouponTypeEnum {
@@ -36,9 +42,13 @@
@Column(name = "sc_name")
private String name;
- // 鍥剧墖
+ // 鍥剧墖-鏈夋晥
@Column(name = "sc_picture")
private String picture;
+
+ // 鍥剧墖-澶辨晥
+ @Column(name = "sc_picture_invalid")
+ private String pictureInvalid;
// 绠�浠嬩綔鐢細浠绘��0鍏冭喘銆佸啀杩�10%
@Column(name = "sc_effect")
@@ -202,5 +212,13 @@
public void setEffect(String effect) {
this.effect = effect;
}
+
+ public String getPictureInvalid() {
+ return pictureInvalid;
+ }
+
+ public void setPictureInvalid(String pictureInvalid) {
+ this.pictureInvalid = pictureInvalid;
+ }
}
--
Gitblit v1.8.0