From fb1d948a7b64cd02083b7b6f7ae18d16ad638609 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 十二月 2019 18:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
index 5c8d2a4..abf91c7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -20,8 +20,7 @@
public class ThreeSale {
public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
- public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
- public static int EXPIRE_SEPARATE = 2;// 閭�璇峰叧绯昏劚绂�
+ public static int EXPIRE_OUTOFDATE = 1;// 閭�璇峰叧绯昏劚绂�
public static int STATE_SUCCESS = 1;// 鎴愬姛
public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
--
Gitblit v1.8.0