From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
index 6702701..cb3a4c3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
@@ -33,6 +33,10 @@
@Column(name = "pc_uids")
private String uids;
+ // 鐗堟湰鍙�
+ @Column(name = "pc_versions")
+ private String versions;
+
// 鍗曟帹鐢ㄦ埛id
@Column(name = "pc_remark")
private String remark;
@@ -172,4 +176,12 @@
this.updateTime = updateTime;
}
+ public String getVersions() {
+ return versions;
+ }
+
+ public void setVersions(String versions) {
+ this.versions = versions;
+ }
+
}
--
Gitblit v1.8.0