From 540d17e0d21a252162e9eccf021d223cdb331119 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 06 十二月 2019 17:46:14 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java | 5 ++++- 1 files changed, 4 insertions(+), 1 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 7cd006d..f033fe3 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 @@ -36,6 +36,9 @@ 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"; + public final static int ORDER_TYPE_ZIGOU = 1;// 鑷喘 + public final static int ORDER_TYPE_SHARE = 20;// 鍒嗕韩 + @Column(name = "co_id") private Long id; @@ -105,7 +108,7 @@ @Column(name = "co_trade_id") private String tradeId; - + // 鐘舵�佽鏄� @Column(name = "co_state_desc") private String stateDesc; -- Gitblit v1.8.0