From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
index 4a2df1d..ce0ccdc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
@@ -20,18 +20,17 @@
@Table("yeshi_ec_common_order")
public class CommonOrder {
- // 璁㈠崟鐘舵�� 1-浠樻锛屾垚鍔� 2-缁撶畻锛堝凡鏀惰揣锛� 3-缁存潈 4-澶辨晥
+ // 璁㈠崟鐘舵�� 1-浠樻锛屾垚鍔� 2-缁撶畻锛堝凡鏀惰揣锛� 3-缁存潈 4-澶辨晥
public final static int STATE_FK = 1;
public final static int STATE_JS = 2;
public final static int STATE_WQ = 3;
public final static int STATE_SX = 4;
-
+
// 璁㈠崟绾㈠寘绫诲瀷鍥剧墖
public final static String TYPE_FANLI = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_fanli.png";
public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";
public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";
-
-
+
@Column(name = "co_id")
private Long id;
@@ -86,10 +85,13 @@
// 涓嬪崟鏃堕棿-绗笁鏂瑰垱寤烘椂闂�
@Column(name = "co_third_create_time")
private Date thirdCreateTime;
-
+
// 鏀惰揣鏃堕棿-缁撶畻鏃堕棿
@Column(name = "co_settle_time")
private Date settleTime;
+
+ @Column(name = "co_order_by")
+ private Integer orderBy;// 瀛愯鍗曠殑鎺掑簭鍊�
// 鍒涘缓鏃堕棿
@Column(name = "co_create_time")
@@ -98,11 +100,11 @@
// 鏇存柊鏃堕棿
@Column(name = "co_update_time")
private Date updateTime;
-
+
public CommonOrder() {
}
-
+
public CommonOrder(Long id) {
this.id = id;
}
@@ -219,6 +221,14 @@
this.settleTime = settleTime;
}
+ public Integer getOrderBy() {
+ return orderBy;
+ }
+
+ public void setOrderBy(Integer orderBy) {
+ this.orderBy = orderBy;
+ }
+
public Date getCreateTime() {
return createTime;
}
--
Gitblit v1.8.0