From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
index a68273c..690ed3b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
@@ -35,7 +35,7 @@
// 鍟嗗搧鏉ユ簮
@Column(name = "ucr_good_source")
- private int goodSource;
+ private Integer goodSource;
// 鐢ㄦ埛鍒�
@Column(name = "ucr_user_coupon_id")
@@ -77,11 +77,11 @@
this.goodId = goodId;
}
- public int getGoodSource() {
+ public Integer getGoodSource() {
return goodSource;
}
- public void setGoodSource(int goodSource) {
+ public void setGoodSource(Integer goodSource) {
this.goodSource = goodSource;
}
--
Gitblit v1.8.0