From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 27 八月 2019 12:32:46 +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/bus/user/HongBaoV2.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java index 42f849c..e0614de 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java @@ -26,7 +26,7 @@ public final static int STATE_YILINGQU = 3; public final static int STATE_SHIXIAO = 4; - // 5-閮ㄥ垎澶辨晥 + // 5-閮ㄥ垎澶辨晥(杩斿洖瀹㈡埛绔樉绀虹敤锛屼笉鐢ㄤ綔閫昏緫澶勭悊) public final static int STATE_BUFENSHIXIAO = 5; // 鑷喘绾㈠寘 鑰佺増 2灞炰簬鑷喘 @@ -35,6 +35,9 @@ public final static int TYPE_HUODONG = 3; // 鏂颁汉绾㈠寘 public final static int TYPE_XINREN = 4; + + // 浣跨敤鍒哥孩鍖� + public final static int TYPE_COUPON = 10; public final static int TYPE_YAOQING = 5; @@ -50,6 +53,8 @@ // 浜岀骇鍒嗕韩璧氬垎閿�绾㈠寘 public final static int TYPE_SHARE_ERJI = 22; + // 浣跨敤鍒哥孩鍖� + public final static int TYPE_EXCHANGE = 30; @Column(name = "hb_id") private Long id; -- Gitblit v1.8.0