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

admin

2020-06-09 afe61a27c4f77db65df66b0ff5dc93cbd3e0014b

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

@@ -58,6 +58,11 @@
   // 饿了么红包

   public final static int TYPE_ELME = 25;



   // 超级会员

   public final static int RANK_VIP = 100;

   public final static int RANK_VIP_PRE_3 = 30;// 超级会员第一阶段

   public final static int RANK_VIP_PRE_7 = 70;// 超级会员第二阶段



   @Column(name = "hb_id")

   private Long id;