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/PushQueueRecord.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java
index e8a0f02..e5d933d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java
@@ -50,6 +50,10 @@
@org.yeshi.utils.mybatis.Column(name = "qe_push_num")
private Integer pushNum;
+ /* 鎺ㄩ�佺殑鐗堟湰鍙� */
+ @Column(name="`qe_versions`")
+ @org.yeshi.utils.mybatis.Column(name = "qe_versions")
+ private String versions;
/* 鐘舵�侊細 鎵ц鐘舵�� 锛�0 鏈墽琛� 1鎵ц瀹屾垚 2鎵ц澶辫触 */
@Column(name="`qe_state`")
@@ -146,5 +150,13 @@
public void setEndtime(Date endtime) {
this.endtime = endtime;
}
+
+ public String getVersions() {
+ return versions;
+ }
+
+ public void setVersions(String versions) {
+ this.versions = versions;
+ }
}
--
Gitblit v1.8.0