Merge remote-tracking branch 'origin/div' into div

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java

@@ -20,7 +20,7 @@
public class ThreeSale {



   public static int EXPIRE_NORMAL = 0;// 正常状态

   public static int EXPIRE_OUTOFDATE = 1;// 过期状态

   public static int EXPIRE_OUTOFDATE = 1;// 邀请关系脱离



   public static int STATE_SUCCESS = 1;// 成功

   public static int STATE_NOT_SUCCESS = 0;// 尚未成功