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/PushGoods.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
index 8981c47..e361c36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
@@ -32,8 +32,11 @@
private String picture;
// 鎺ㄩ�佺敤鎴穒d 浣跨敤浜庡崟鎺�
- @Column(name = "pg_uid")
+// @Column(name = "pg_uid")
private Long uid;
+
+ @Column(name = "pg_versions")
+ private String versions;
// 鏄惁宸叉帹閫�
@Column(name = "pg_is_push")
@@ -134,14 +137,6 @@
this.updateTime = updateTime;
}
- public Long getUid() {
- return uid;
- }
-
- public void setUid(Long uid) {
- this.uid = uid;
- }
-
public Long getCountGoods() {
return countGoods;
}
@@ -157,5 +152,21 @@
public void setPicture(String picture) {
this.picture = picture;
}
+
+ public String getVersions() {
+ return versions;
+ }
+
+ public void setVersions(String versions) {
+ this.versions = versions;
+ }
+
+ public Long getUid() {
+ return uid;
+ }
+
+ public void setUid(Long uid) {
+ this.uid = uid;
+ }
}
--
Gitblit v1.8.0